svn commit: r1625202 - /apr/apr-util/branches/1.5.x/CHANGES

[tr...@apache.org]

Author: trawick
Date: Tue Sep 16 01:40:37 2014
New Revision: 1625202

URL: http://svn.apache.org/r1625202
Log:
r1543401 fixed PR 56616 too; merge the two cmake CHANGES entries

Modified:
    apr/apr-util/branches/1.5.x/CHANGES

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1625202&r1=1625201&r2=1625202&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Tue Sep 16 01:40:37 2014
@@ -1,9 +1,6 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.4
 
-  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and 
-     later.  [Jeff Trawick]
-
   *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
      [Philip Martin <philip.martin wandisco.com>]
 
@@ -13,8 +10,10 @@ Changes with APR-util 1.5.4
   *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
      [Tom Donovan]
 
-  *) Windows cmake build: Fix an incompatiblity with Visual Studio
-     generators.  [Jeff Trawick, Bert Huijben]
+  *) Windows cmake build: Fix incompatiblities with Visual Studio
+     generators with all cmake versions, and the NMake Makefile generator
+     with cmake 2.8.12 and later.  PR 56616 and other bugs.  [Jeff Trawick,
+     Bert Huijben]
 
   *) Fix detection of Berkeley DB 6.0. PR 55277.
      [Lars Wendler <polynomial-c gentoo.org>]