You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/04/09 08:34:25 UTC
[20/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
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 <tk...@apache.org>
Authored: Mon Apr 8 12:51:13 2013 +0200
Committer: tkurz <tk...@apache.org>
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(-)
----------------------------------------------------------------------