Author: fchrist
Date: Thu Mar 29 13:33:41 2012
New Revision: 1306849
URL: http://svn.apache.org/viewvc?rev=1306849&view=rev
Log:
STANBOL-557 merged changes to release branch
Removed:
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/META-INF/NOTICE
Modified:
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/META-INF/LICENSE
Propchange:
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 29 13:33:41 2012
@@ -0,0 +1 @@
+/incubator/stanbol/trunk/commons/web/home/src/main/appended-resources:1301064-1306848
Modified:
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/META-INF/LICENSE?rev=1306849&r1=1306848&r2=1306849&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/META-INF/LICENSE
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/commons/web/home/src/main/appended-resources/META-INF/LICENSE
Thu Mar 29 13:33:41 2012
@@ -1,4 +1,12 @@
+This product contains sources of the following third party products
+with their licenses as listed below:
+
+jQuery JavaScript Library v1.4.2, http://jquery.com/
+Copyright 2010, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+
-----------------------------------------------------------------------------
MIT License
