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

Posted to commits@subversion.apache.org by hw...@apache.org on 2010/10/14 21:23:23 UTC

svn commit: r1022668 - /subversion/branches/performance/STATUS

Author: hwright
Date: Thu Oct 14 19:23:22 2010
New Revision: 1022668

URL: http://svn.apache.org/viewvc?rev=1022668&view=rev
Log:
On the performance branch:
* STATUS: Add a note about r987888.

Modified:
    subversion/branches/performance/STATUS

Modified: subversion/branches/performance/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/performance/STATUS?rev=1022668&r1=1022667&r2=1022668&view=diff
==============================================================================
--- subversion/branches/performance/STATUS (original)
+++ subversion/branches/performance/STATUS Thu Oct 14 19:23:22 2010
@@ -75,4 +75,6 @@ They will be merged into /trunk after pa
  Ignore files generated by MS VisualStudio 2010.
  Justification:
    Dev usability improvement. No functional changes.
-
+ Merged:
+   Merged in r1022665.  The changes to the wcroot were ignore, since an
+   equivalent (but conflicting) change was already made there on trunk.