You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/06/25 10:31:40 UTC

svn commit: r1353429 - /incubator/directmemory/trunk/LICENSE

Author: olamy
Date: Mon Jun 25 08:31:39 2012
New Revision: 1353429

URL: http://svn.apache.org/viewvc?rev=1353429&view=rev
Log:
add license used for incorporated works: jquery

Modified:
    incubator/directmemory/trunk/LICENSE

Modified: incubator/directmemory/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/LICENSE?rev=1353429&r1=1353428&r2=1353429&view=diff
==============================================================================
--- incubator/directmemory/trunk/LICENSE (original)
+++ incubator/directmemory/trunk/LICENSE Mon Jun 25 08:31:39 2012
@@ -200,3 +200,32 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+APPENDIX II:  Licenses for Incorporated Works.
+
+------
+jQuery, Jquery tmpl, jQuery JSON Plugin
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+