summaryrefslogtreecommitdiffstats
path: root/third_party/simplejson/LICENSE.txt
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 20:19:32 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 20:19:32 +0000
commit3fccca99f7ef36f7e1fce649094cac1944cb11c0 (patch)
tree4df52a7511ff9848a16022e6a2a5d3c6b6f47e8e /third_party/simplejson/LICENSE.txt
parent5a826acc884444c6cfa3a26adc89fe9cac99749e (diff)
downloadchromium_src-3fccca99f7ef36f7e1fce649094cac1944cb11c0.zip
chromium_src-3fccca99f7ef36f7e1fce649094cac1944cb11c0.tar.gz
chromium_src-3fccca99f7ef36f7e1fce649094cac1944cb11c0.tar.bz2
Rolling back 22300.
Messy deps... BUG=None TEST=None TBR=rafaelw git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/simplejson/LICENSE.txt')
-rwxr-xr-xthird_party/simplejson/LICENSE.txt19
1 files changed, 0 insertions, 19 deletions
diff --git a/third_party/simplejson/LICENSE.txt b/third_party/simplejson/LICENSE.txt
deleted file mode 100755
index ad95f29..0000000
--- a/third_party/simplejson/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-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.