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/02/27 15:31:14 UTC
[1/2] git commit: proper starting of the NOTICE file
proper starting of the NOTICE file
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5969e4b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5969e4b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5969e4b0
Branch: refs/heads/master
Commit: 5969e4b0e19bdc33aa9e92c6a5f182caef18d418
Parents: 56b8981
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Feb 27 15:29:28 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Feb 27 15:29:28 2013 +0100
----------------------------------------------------------------------
NOTICE.txt | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5969e4b0/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index ed8ca2a..d717690 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,11 +1,15 @@
Apache Marmotta
-Copyright 2013 The Apache Software Foundation
+Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Portions of this software were originally based on the following:
-In addition, the binary distribution of this product includes the
-following software:
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.
+
+In addition, the binary distribution of this product includes the following software:
@@TODO@@