Author: jan
Date: Wed May 13 13:13:11 2009
New Revision: 774321

URL: http://svn.apache.org/viewvc?rev=774321&view=rev
Log:
blocked r762153 from trunk

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

Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:13:11 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:13:11 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440


Reply via email to