Author: joes
Date: Tue Dec 7 02:42:25 2010
New Revision: 1042893
URL: http://svn.apache.org/viewvc?rev=1042893&view=rev
Log:
merge was broken
Modified:
httpd/apreq/trunk/CHANGES
Modified: httpd/apreq/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=1042893&r1=1042892&r2=1042893&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Tue Dec 7 02:42:25 2010
@@ -3,6 +3,9 @@
@section v2_14 Changes with libapreq2-2.14 (in development)
+- C API [joes]
+ Fix mod_apreq2's config merging.
+
@section v2_13 Changes with libapreq2-2.13 (released December 3, 2010)
- HTTP Only Cookie [Robert Stone & Adam Prime]
