couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cml...@apache.org
Subject svn commit: r690661 - in /incubator/couchdb/branches/json_term_changes: ./ share/Makefile.am test/
Date Sun, 31 Aug 2008 09:02:57 GMT
Author: cmlenz
Date: Sun Aug 31 02:02:57 2008
New Revision: 690661

URL: http://svn.apache.org/viewvc?rev=690661&view=rev
Log:
Merged revisions 690606-690660 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/couchdb/trunk

Modified:
    incubator/couchdb/branches/json_term_changes/   (props changed)
    incubator/couchdb/branches/json_term_changes/share/Makefile.am
    incubator/couchdb/branches/json_term_changes/test/   (props changed)

Propchange: incubator/couchdb/branches/json_term_changes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Aug 31 02:02:57 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-690605
+/incubator/couchdb/trunk:1-690660

Modified: incubator/couchdb/branches/json_term_changes/share/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/json_term_changes/share/Makefile.am?rev=690661&r1=690660&r2=690661&view=diff
==============================================================================
--- incubator/couchdb/branches/json_term_changes/share/Makefile.am (original)
+++ incubator/couchdb/branches/json_term_changes/share/Makefile.am Sun Aug 31 02:02:57 2008
@@ -18,6 +18,7 @@
     www/browse/_delete_database.html \
     www/browse/_delete_document.html \
     www/browse/_save_view_as.html \
+    www/browse/_upload_attachment.html \
     www/browse/database.html \
     www/browse/document.html \
     www/browse/index.html \
@@ -59,6 +60,7 @@
     www/script/jquery.cookies.js \
     www/script/jquery.couch.js \
     www/script/jquery.dialog.js \
+    www/script/jquery.form.js \
     www/script/jquery.resizer.js \
     www/script/jquery.suggest.js \
     www/script/json2.js \

Propchange: incubator/couchdb/branches/json_term_changes/test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Aug 31 02:02:57 2008
@@ -1,3 +1,4 @@
 .deps
 Makefile.in
 Makefile
+*.beam



Mime
View raw message