Author: fchrist
Date: Thu Mar 29 12:59:07 2012
New Revision: 1306826
URL: http://svn.apache.org/viewvc?rev=1306826&view=rev
Log:
STANBOL-557 merged changes to release branch
Removed:
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/META-INF/NOTICE
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/META-INF/LICENSE
Propchange:
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 29 12:59:07 2012
@@ -0,0 +1 @@
+/incubator/stanbol/trunk/contenthub/web/src/main/appended-resources:1301064-1306825
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/META-INF/LICENSE?rev=1306826&r1=1306825&r2=1306826&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/META-INF/LICENSE
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/contenthub/web/src/main/appended-resources/META-INF/LICENSE
Thu Mar 29 12:59:07 2012
@@ -1,4 +1,8 @@
+This product contains sources of the following third party products
+with their licenses as listed below:
+
+Contains JIT 1.1.3 library is licensed under a BSD-style License.
JIT 1.1.3 License
-----------------
