You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2012/03/29 15:36:51 UTC
svn commit: r1306853 - in
/incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources:
./ META-INF/LICENSE META-INF/NOTICE
Author: fchrist
Date: Thu Mar 29 13:36:50 2012
New Revision: 1306853
URL: http://svn.apache.org/viewvc?rev=1306853&view=rev
Log:
STANBOL-557 merged changes to release branch
Removed:
incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/META-INF/NOTICE
Modified:
incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/ (props changed)
incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/META-INF/LICENSE
Propchange: incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 29 13:36:50 2012
@@ -0,0 +1 @@
+/incubator/stanbol/trunk/factstore/factstore/src/main/appended-resources:1301064-1306852
Modified: incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/META-INF/LICENSE?rev=1306853&r1=1306852&r2=1306853&view=diff
==============================================================================
--- incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/stanbol/branches/0.9.0-incubating/factstore/factstore/src/main/appended-resources/META-INF/LICENSE Thu Mar 29 13:36:50 2012
@@ -1,8 +1,7 @@
------------------------------------------------------------------------------
+This product contains sources of the following third party products
+with their licenses as listed below:
-JSON2 Public Domain License
-
-See http://www.JSON.org/js.html
+JSON2 Library. See http://www.JSON.org/js.html
+Public Domain.
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-