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:21:29 UTC
svn commit: r1022665 - in /subversion/trunk: ./ build/win32/
Author: hwright
Date: Thu Oct 14 19:21:29 2010
New Revision: 1022665
URL: http://svn.apache.org/viewvc?rev=1022665&view=rev
Log:
Merge r987888 from the performance branch.
This only makes changes to build/win32, since the changes to the wcroot were
already made on trunk in some prior revision.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/build/win32/ (props changed)
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 14 19:21:29 2010
@@ -23,7 +23,7 @@
/subversion/branches/log-g-performance:870941-871032
/subversion/branches/merge-skips-obstructions:874525-874615
/subversion/branches/nfc-nfd-aware-client:870276,870376
-/subversion/branches/performance:983764,983766,984927,985014,985037,985046,985477,985669,987893,995507,995603,1001413
+/subversion/branches/performance:983764,983766,984927,985014,985037,985046,985477,985669,987888,987893,995507,995603,1001413
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/subtree-mergeinfo:876734-878766
Propchange: subversion/trunk/build/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 14 19:21:29 2010
@@ -9,3 +9,4 @@ msvc-dsp
*.vcxproj
vcnet-vcproj
*.user
+*.log