Author: fchrist
Date: Wed Mar 28 12:16:24 2012
New Revision: 1306286
URL: http://svn.apache.org/viewvc?rev=1306286&view=rev
Log:
STANBOL-557 Merged NOTICE and LICENSE changes
Removed:
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/META-INF/NOTICE
Modified:
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/META-INF/LICENSE
Propchange:
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 28 12:16:24 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/appended-resources:1156596-1163703
+/incubator/stanbol/branches/lto-reasoners/reasoners/jena/src/main/appended-resources:1180011-1205767
+/incubator/stanbol/trunk/reasoners/jena/src/main/appended-resources:1301064-1306285
Modified:
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/META-INF/LICENSE?rev=1306286&r1=1306285&r2=1306286&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/META-INF/LICENSE
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/reasoners/jena/src/main/appended-resources/META-INF/LICENSE
Wed Mar 28 12:16:24 2012
@@ -1,3 +1,11 @@
+This product contains sources of the following third party products
+with their licenses as listed below:
+
+Contains test resources mentioned in
+src/main/test/resources/README licensed under
+the Creative Commons Attribution License, Version 1.0.
+
+-----------------------------------------------------------------------------
Creative Commons Attribution License, Version 1.0
