restore post-2_0_28 changes following tag bump

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91879 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 13ef2b88b8a71ea16a86b9f0d9b5244106d2da57..f990652bcdaa9ebfa19dd6c37f84c9842a36bea1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+Changes with Apache 2.0.29-dev
+
+  *) Add Debian layout.  [Daniel Stone <daniel@sfarc.net>]
+
+  *) If shared modules are requested and mod_so is not available,
+     produce a fatal config-time error.  [Justin Erenkrantz]
+
+  *) Improve http2env's performance by cutting the work it has to
+     do.  [Brian Pane <bpane@pacbell.net>]
+
+  *) use new 'apr_hash_merge' function in mod_mime (performance fix)
+     [Brian Pane <bpane@pacbell.net>]
+
 Changes with Apache 2.0.28
 
   *) Fix infinite loop in mod_cgid.c.