Author: fchrist
Date: Thu Mar 29 13:39:15 2012
New Revision: 1306855
URL: http://svn.apache.org/viewvc?rev=1306855&view=rev
Log:
STANBOL-557 merged changes to release branch
Removed:
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/META-INF/NOTICE
Modified:
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/META-INF/LICENSE
Propchange:
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 29 13:39:15 2012
@@ -0,0 +1 @@
+/incubator/stanbol/trunk/enhancer/jersey/src/main/appended-resources:1301064-1306854
Modified:
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/META-INF/LICENSE?rev=1306855&r1=1306854&r2=1306855&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/META-INF/LICENSE
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/enhancer/jersey/src/main/appended-resources/META-INF/LICENSE
Thu Mar 29 13:39:15 2012
@@ -1,7 +1,8 @@
+This product contains sources of the following third party products
+with their licenses as listed below:
-OpenLayers 2.9 License
-----------------------
+OpenLayers 2.9 is licensed under a BSD license.
This license applies to all code and content in the 'branches', 'trunk', and
'project' directories of the Openlayers code repository at svn.openlayers.org,
