@@ -210,30 +210,6 @@ code for the these subcomponents is subject to the terms and conditions of the following licenses. =============================================================================== -jquery.js: - -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. - -=============================================================================== Zend Framework: Copyright (c) 2006-2007, Zend Technologies USA, Inc. LICENSE @@ -9,9 +9,6 @@ This product includes software (Gadget Server, Gadget Container) originally developed by Google Inc. (http://code.google.com/) and licensed to the ASF as initial contribution for Shindig. -This product includes the jquery.js file, -Copyright (c) 2007 John Resig, http://jquery.com/ - This distribution includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of NOTICE a4b6bba8543f80b58b31bc9822e4feb376c55d73 Vincent Siveton vsiveton@apache.org http://github.com/sgala/apache-incubator-shindig/commit/33320f1e82a36f5ae4a942b5bccfbda08f111c68 33320f1e82a36f5ae4a942b5bccfbda08f111c68

2009-05-02T05:34:24-07:00

o merged r770160 about jquery git-svn-id: https://svn.apache.org/repos/asf/incubator/shindig/trunk@770947 13f79535-47bb-0310-9956-ffa450edef68 a550827978ea7313d5baba8dba7bd2ddb5541d23 Vincent Siveton vsiveton@apache.org