couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r764868 - in /couchdb/branches/0.9.x: ./ NOTICE etc/default/couchdb
Date Tue, 14 Apr 2009 16:36:54 GMT
Author: nslater
Date: Tue Apr 14 16:36:53 2009
New Revision: 764868

URL: http://svn.apache.org/viewvc?rev=764868&view=rev
Log:
merged r760532 from trunk

Modified:
    couchdb/branches/0.9.x/   (props changed)
    couchdb/branches/0.9.x/NOTICE
    couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:36:53 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503
+/couchdb/trunk:758717,760442,760503,760532

Modified: couchdb/branches/0.9.x/NOTICE
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/NOTICE?rev=764868&r1=764867&r2=764868&view=diff
==============================================================================
--- couchdb/branches/0.9.x/NOTICE (original)
+++ couchdb/branches/0.9.x/NOTICE Tue Apr 14 16:36:53 2009
@@ -22,8 +22,6 @@
 
    Copyright 2007, Mochi Media Coporation
 
- * ibrowse
- (http://jungerl.cvs.sourceforge.net/viewvc/jungerl/jungerl/lib/ibrowse/)
+ * ibrowse (http://jungerl.cvs.sourceforge.net/viewvc/jungerl/jungerl/lib/ibrowse/)
 
    Copyright 2008, Chandrashekhar Mullaparthi
-   This ASF redistribution is consistent with the terms of the BSD License.

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:36:53 2009
@@ -1,4 +1,4 @@
 /couchdb/branches/design_resources/etc/default/couchdb:751716-751803
 /couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440



Mime
View raw message