From d091ca7053d5a8b4f779aeddf50195995cf181b9 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Tue, 15 Jan 2008 05:12:39 +0000 Subject: [PATCH] * Amended license to exclude jQuery, and included jQuery-specific license. --- LICENSE | 4 +++- LICENSE.JQUERY | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 LICENSE.JQUERY diff --git a/LICENSE b/LICENSE index 40bddb22..bd8a49e0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Jutda Helpdesk -End User License Agreement (Last Updated January 12th 2007) +End User License Agreement (Last Updated January 15th 2007) SUMMARY @@ -48,4 +48,6 @@ MISCELLANEOUS Jutda reserves the right to change the terms of this agreement at any time. +EXCEPTIONS +This software is distributed with a copy jQuery, a javascript library written by John Resig.. jQuery is not distributed under the above license, but rather uses the MIT license. See LICENSE.JQUERY for further details. diff --git a/LICENSE.JQUERY b/LICENSE.JQUERY new file mode 100644 index 00000000..965a8313 --- /dev/null +++ b/LICENSE.JQUERY @@ -0,0 +1,20 @@ +Copyright (c) 2007 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.