Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/9432e311 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/9432e311 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/9432e311 Branch: refs/heads/develop Commit: 9432e31177b04abaa94233f1c565a16a992e6ef9 Parents: 2f3dabb ac1b54b Author: Sebastian Schaffert <[email protected]> Authored: Fri May 3 13:17:22 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Fri May 3 13:17:22 2013 +0200 ---------------------------------------------------------------------- client/marmotta-client-js-sample-webapp/pom.xml | 2 +- client/marmotta-client-php/pom.xml | 2 +- libraries/ldcache/ldcache-backend-mapdb/pom.xml | 2 +- parent/pom.xml | 7 +- .../main/resources/web/admin/snorql/snorql.html | 7 +- .../src/main/resources/web/admin/snorql/snorql.js | 117 ++++++++------- pom.xml | 4 +- 7 files changed, 76 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
