Author: al
Date: Tue Aug 27 19:20:45 2013
New Revision: 1517933
URL: http://svn.apache.org/r1517933
Log:
Add SimpleJSON license
Modified:
incubator/wave/branches/wave-0.4-release/LICENSE
Modified: incubator/wave/branches/wave-0.4-release/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/LICENSE?rev=1517933&r1=1517932&r2=1517933&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/LICENSE (original)
+++ incubator/wave/branches/wave-0.4-release/LICENSE Tue Aug 27 19:20:45 2013
@@ -308,3 +308,25 @@ WHETHER IN CONTRACT, STRICT LIABILITY, O
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+***THE FOLLOWING LICENSE APPLIES TO***
+-SimpleJSON located at /src/python/api/simplejson/
+
+Copyright (c) 2006 Bob Ippolito
+
+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.
