Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ef113cd2 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ef113cd2 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ef113cd2 Branch: refs/heads/develop Commit: ef113cd2dae393ae5ceb2e34254c3882bbb0527d Parents: e3059d6 f7cc0bc Author: Sergio Fernández <[email protected]> Authored: Tue Feb 25 16:53:57 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Tue Feb 25 16:53:57 2014 +0100 ---------------------------------------------------------------------- .../org/apache/marmotta/ldpath/parser/ldpath.jj | 1106 ++++++++++++++++++ .../apache/marmotta/ldpath/parser/rdfpath.jj | 1104 ----------------- .../marmotta/loader/statistics/Statistics.java | 74 +- .../loader/core/test/LoaderTestBase.java | 7 +- .../core/test/dummy/DummyLoaderBackend.java | 4 +- .../core/test/dummy/DummyLoaderHandler.java | 17 +- 6 files changed, 1173 insertions(+), 1139 deletions(-) ----------------------------------------------------------------------
