couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1095570 - in /couchdb/branches/1.1.x: ./ etc/default/couchdb license.skip share/Makefile.am
Date Thu, 21 Apr 2011 00:08:34 GMT
Author: davisp
Date: Thu Apr 21 00:08:33 2011
New Revision: 1095570

URL: http://svn.apache.org/viewvc?rev=1095570&view=rev
Log:
Fix build system to include new files.

Backport of 1095569 from trunk.


Modified:
    couchdb/branches/1.1.x/   (props changed)
    couchdb/branches/1.1.x/etc/default/couchdb   (props changed)
    couchdb/branches/1.1.x/license.skip
    couchdb/branches/1.1.x/share/Makefile.am

Propchange: couchdb/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 21 00:08:33 2011
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:1045203,1064417,1081107-1083320,1095523,1095557
+/couchdb/trunk:1045203,1064417,1081107-1083320,1095523,1095557,1095569

Propchange: couchdb/branches/1.1.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 21 00:08:33 2011
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:1045203,1064417,1081107-1083320,1095523,1095557
+/couchdb/trunk/etc/default/couchdb:1045203,1064417,1081107-1083320,1095523,1095557,1095569
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/1.1.x/license.skip
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/license.skip?rev=1095570&r1=1095569&r2=1095570&view=diff
==============================================================================
--- couchdb/branches/1.1.x/license.skip (original)
+++ couchdb/branches/1.1.x/license.skip Thu Apr 21 00:08:33 2011
@@ -66,6 +66,7 @@
 ^share/www/script/sha1.js
 ^share/www/script/base64.js
 ^share/www/script/test/lorem*
+^share/www/style/jquery-ui-1.8.11.custom.css
 ^src/Makefile
 ^src/Makefile.in
 ^src/couchdb/.*beam

Modified: couchdb/branches/1.1.x/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/share/Makefile.am?rev=1095570&r1=1095569&r2=1095570&view=diff
==============================================================================
--- couchdb/branches/1.1.x/share/Makefile.am (original)
+++ couchdb/branches/1.1.x/share/Makefile.am Thu Apr 21 00:08:33 2011
@@ -81,6 +81,8 @@ nobase_dist_localdata_DATA = \
     www/image/save.png \
     www/image/sidebar-toggle.png \
     www/image/spinner.gif \
+	www/image/spinner_33.gif \
+	www/image/spinner_6b.gif \
     www/image/test_failure.gif \
     www/image/test_success.gif \
     www/image/thead-key.gif \
@@ -101,6 +103,7 @@ nobase_dist_localdata_DATA = \
     www/script/jquery.editinline.js \
     www/script/jquery.form.js \
     www/script/jquery.js \
+	www/script/jquery-ui-1.8.11.custom.min.js \
     www/script/jquery.resizer.js \
     www/script/jquery.suggest.js \
     www/script/json2.js \
@@ -193,5 +196,6 @@ nobase_dist_localdata_DATA = \
     www/spec/jquery_couch_js_instance_methods_3_spec.js \
     www/spec/run.html \
     www/status.html \
-    www/style/layout.css \
+    www/style/jquery-ui-1.8.11.custom.css \
+	www/style/layout.css \
     www/_sidebar.html



Mime
View raw message