subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1569520 - /subversion/branches/1.7.x/CHANGES
Date Tue, 18 Feb 2014 20:21:06 GMT
Author: breser
Date: Tue Feb 18 20:21:06 2014
New Revision: 1569520

URL: http://svn.apache.org/r1569520
Log:
* CHANGES: Merge r1565530 from trunk with --accept=mc to avoid conflicts from
    1.8/1.9 CHANGES entries.

Modified:
    subversion/branches/1.7.x/CHANGES   (contents, props changed)

Modified: subversion/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1569520&r1=1569519&r2=1569520&view=diff
==============================================================================
--- subversion/branches/1.7.x/CHANGES (original)
+++ subversion/branches/1.7.x/CHANGES Tue Feb 18 20:21:06 2014
@@ -795,7 +795,7 @@ http://svn.apache.org/repos/asf/subversi
             http://subversion.apache.org/security/CVE-2011-1752-advisory.txt
     * fixed: write-through proxy could direcly commit to slave (r917523)
     * detect a particular corruption condition in FSFS (r1100213)
-    * improve error message when clients refer to unkown revisions (r939000)
+    * improve error message when clients refer to unknown revisions (r939000)
     * bugfixes and optimizations to the DAV mirroring code (r878607)
     * fixed: locked and deleted file causes tree conflict (issue #3525)
     * fixed: update touches locked file with svn:keywords property (issue #3471)
@@ -1165,7 +1165,7 @@ http://svn.apache.org/repos/asf/subversi
   * improve performance of 'svn update' on large files (r36389, et. al.)
   * fixed: error leak and potential crash (r36860)
   * fixed: parent directory handling on Windows (r36049, -50, -51, -131)
-  * fixed: unintialized memory errors (r36252, -3)
+  * fixed: uninitialized memory errors (r36252, -3)
   * fixed: potential working copy corruption (r36714)
   * fixed: working copy upgrade error (r36302)
   * fixed: pointer dereference error (r36783)

Propchange: subversion/branches/1.7.x/CHANGES
------------------------------------------------------------------------------
  Merged /subversion/trunk/CHANGES:r1565530



Mime
View raw message