Author: fchrist
Date: Thu Mar 29 13:16:15 2012
New Revision: 1306838
URL: http://svn.apache.org/viewvc?rev=1306838&view=rev
Log:
STANBOL-557 merged changes to release branch
Removed:
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/META-INF/NOTICE
Modified:
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/META-INF/LICENSE
Propchange:
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 29 13:16:15 2012
@@ -0,0 +1 @@
+/incubator/stanbol/trunk/rules/web/src/main/appended-resources:1301064-1306837
Modified:
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/META-INF/LICENSE?rev=1306838&r1=1306837&r2=1306838&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/META-INF/LICENSE
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/rules/web/src/main/appended-resources/META-INF/LICENSE
Thu Mar 29 13:16:15 2012
@@ -1,4 +1,15 @@
+This product contains sources of the following third party products
+with their licenses as listed below:
+
+jQuery JavaScript Library v1.6.1, http://jquery.com/
+Copyright 2011, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+ Includes Sizzle.js, http://sizzlejs.com/
+ Copyright 2011, The Dojo Foundation
+ Released under the MIT, BSD, and GPL Licenses.
+
-----------------------------------------------------------------------------
MIT License
@@ -307,7 +318,7 @@ POSSIBILITY OF SUCH DAMAGES.
-----------------------------------------------------------------------------
-BSD License from JIT 1.1.3
+BSD License
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
