summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Lenz <cmlenz@apache.org>2009-01-07 21:03:41 +0000
committerChristopher Lenz <cmlenz@apache.org>2009-01-07 21:03:41 +0000
commitb4b3f972483c20f17266987d94ae3b32ed00aa2d (patch)
treed5709d58d6703e39a00c1b28b57011240e4fd4d3
parentef1e6a1c98ff0c2e2bb2789495c9d272f14078b8 (diff)
Add jquery.history to the build and the LICENSE/NOTICE files.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@732492 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--LICENSE16
-rw-r--r--NOTICE4
-rw-r--r--share/Makefile.am1
3 files changed, 13 insertions, 8 deletions
diff --git a/LICENSE b/LICENSE
index 2b72b4ab..e8f937ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -262,15 +262,9 @@ For the share/www/script/jquery.form.js component:
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-For the share/www/script/json2.js component:
-
- Public Domain
-
- No warranty expressed or implied. Use at your own risk.
-
-For the src/couchdb/cjson.erl component:
+For the share/www/script/jquery.history.js component:
- Copyright (c) 2006 Mochi Media, Inc.
+ http://www.mikage.to/jquery/jquery_history.html
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -291,6 +285,12 @@ For the src/couchdb/cjson.erl component:
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+For the share/www/script/json2.js component:
+
+ Public Domain
+
+ No warranty expressed or implied. Use at your own risk.
+
For the src/mochiweb component:
Copyright (c) 2007 Mochi Media, Inc.
diff --git a/NOTICE b/NOTICE
index bde67a8a..d9bd74b7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -14,6 +14,10 @@ This product also includes the following third-party components:
Copyright 2008, John Resig
+ * jQuery history plugin (http://www.mikage.to/jquery/jquery_history.html)
+
+ Copyright 2006, Taku Sano (Mikage Sawatari)
+
* json2.js (http://www.json.org/)
In the public domain
diff --git a/share/Makefile.am b/share/Makefile.am
index bf3b074b..11712283 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -63,6 +63,7 @@ nobase_dist_localdata_DATA = \
www/script/jquery.couch.js \
www/script/jquery.dialog.js \
www/script/jquery.form.js \
+ www/script/jquery.history.js \
www/script/jquery.resizer.js \
www/script/jquery.suggest.js \
www/script/json2.js \