Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/85f427cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/85f427cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/85f427cf Branch: refs/heads/develop Commit: 85f427cf5518b4dd7d690f232aaf51a5b567f953 Parents: d134dfe d5055d6 Author: tkurz <[email protected]> Authored: Mon Apr 8 12:51:13 2013 +0200 Committer: tkurz <[email protected]> Committed: Mon Apr 8 12:51:13 2013 +0200 ---------------------------------------------------------------------- .../src/main/resources/installer/LICENSE.txt | 35 + .../src/main/resources/installer/NOTICE.txt | 28 + launchers/marmotta-webapp/LICENSE.txt | 2862 +++++++++++++++ launchers/marmotta-webapp/NOTICE.txt | 317 ++- launchers/marmotta-webapp/pom.xml | 2 +- .../src/main/doc/LICENSE.txt | 750 +++-- .../src/main/doc/NOTICE.txt | 220 +- license-mappings.xml | 43 +- 8 files changed, 3756 insertions(+), 501 deletions(-) ----------------------------------------------------------------------
