You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/29 11:07:45 UTC

[1/2] git commit: added the vcard test files to NOTICE

Updated Branches:
  refs/heads/master 3f2588964 -> 6526592fd
Updated Tags:  refs/tags/3.0.0-incubating [created] 39fd6fc79


added the vcard test files to NOTICE


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1780f37f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1780f37f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1780f37f

Branch: refs/heads/master
Commit: 1780f37f62e9d195cbc803b1fa797f2b48a9d459
Parents: 521edc4
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Mar 29 11:07:12 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Mar 29 11:07:12 2013 +0100

----------------------------------------------------------------------
 NOTICE.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1780f37f/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index b1aeeb3..137e7a1 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -136,3 +136,8 @@ The test sources for commons/sesame-tools-rio-jsonld contain the data files
 from the JSON-LD Test Suite. The JSON-LD Test Suite is published as public
 domain (with a Creative Commons Zero license and without copyright). The
 source code is available at https://github.com/json-ld/json-ld.org
+
+The test sources for commons/sesame-tools-rio-vcard contain the test data
+files used by the ical4j library. The ical4j library is copyright (c) 2010,
+Ben Fortuna and published under a New BSD License. The full source code is
+available at https://code.google.com/p/ical4j/source/
\ No newline at end of file


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta

Posted by ss...@apache.org.
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/6526592f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6526592f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6526592f

Branch: refs/heads/master
Commit: 6526592fd55a4964517983f20d42aebee723400b
Parents: 1780f37 3f25889
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Mar 29 11:07:18 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Mar 29 11:07:18 2013 +0100

----------------------------------------------------------------------
 .../resources/web/admin/editor/sparql/css/font.js  |    2 +
 .../src/main/resources/web/admin/snorql/NOTICE     |    7 ++++-
 .../main/resources/web/admin/snorql/namespaces.js  |    2 +-
 .../main/resources/web/admin/snorql/snorql.html    |    2 +-
 .../src/main/resources/web/admin/snorql/snorql.js  |    2 +-
 .../src/main/resources/web/admin/snorql/sparql.js  |   19 ---------------
 .../src/main/resources/web/admin/snorql/style.css  |    2 +-
 7 files changed, 11 insertions(+), 25 deletions(-)
----------------------------------------------------------------------