You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@couchdb.apache.org by cm...@apache.org on 2008/08/31 01:13:40 UTC

svn commit: r690605 - /incubator/couchdb/branches/json_term_changes/

Author: cmlenz
Date: Sat Aug 30 16:13:40 2008
New Revision: 690605

URL: http://svn.apache.org/viewvc?rev=690605&view=rev
Log:
Attempt to fixup svnmerge on json_term_changes branch.

Modified:
    incubator/couchdb/branches/json_term_changes/   (props changed)

Propchange: incubator/couchdb/branches/json_term_changes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Aug 30 16:13:40 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-687336
+/incubator/couchdb/trunk:1-688179