Merge branch 'develop' into MARMOTTA-584
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bdfa3516 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bdfa3516 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bdfa3516 Branch: refs/heads/MARMOTTA-584 Commit: bdfa3516566f09a04433eada0eda3d2b7caa0557 Parents: 7c4ac5a e2b8148 Author: Sergio Fernández <[email protected]> Authored: Mon May 2 17:29:27 2016 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon May 2 17:29:27 2016 +0200 ---------------------------------------------------------------------- NOTICE.txt | 9 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/images/splashscreen.png | Bin 69972 -> 89064 bytes .../src/main/resources/installer/NOTICE.txt | 2 +- .../src/main/webapp/META-INF/NOTICE | 2 +- libraries/kiwi/kiwi-triplestore/pom.xml | 21 +- .../kiwi/persistence/util/ScriptRunner.java | 302 +++++++++++++++++++ .../kiwi/persistence/util/ScriptRunner.java | 302 ------------------- libraries/ldpath/ldpath-ldquery-cli/pom.xml | 2 - .../ldpath-ldquery-cli/src/main/doc/NOTICE.txt | 2 +- .../main/resources/config-defaults.properties | 2 +- .../web/public/img/logo/marmotta-logo.png | Bin 36723 -> 38984 bytes .../resources/web/public/style/blue/style.css | 3 +- .../resources/web/public/style/white/style.css | 2 +- 14 files changed, 334 insertions(+), 317 deletions(-) ----------------------------------------------------------------------
