marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wik...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Date Tue, 26 Mar 2013 15:00:18 GMT
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/3844cbd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3844cbd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3844cbd2

Branch: refs/heads/master
Commit: 3844cbd2276176b0f9e2a491785375d87e0cf000
Parents: 1a1c960 c484a09
Author: Sergio Fernández <wikier@apache.org>
Authored: Tue Mar 26 15:59:24 2013 +0100
Committer: Sergio Fernández <wikier@apache.org>
Committed: Tue Mar 26 15:59:24 2013 +0100

----------------------------------------------------------------------
 LICENSE.txt                                        |   90 ++-
 .../src/main/resources/installer/LICENSE.txt       |  780 +++++++++++++--
 .../src/main/resources/installer/NOTICE.txt        |  545 ++++++++++-
 .../src/main/webapp/META-INF/NOTICE                |   12 -
 .../src/main/doc/NOTICE.txt                        |   13 +-
 5 files changed, 1314 insertions(+), 126 deletions(-)
----------------------------------------------------------------------



Mime
View raw message