diff docs/CHANGES @ 2002:e15f1c62ac51

bumped version to 1.7.0
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 18 Apr 2007 14:23:35 +0200
parents c4bfc16a6081
children c9a295039bf7
line wrap: on
line diff
--- a/docs/CHANGES	Tue Apr 17 23:19:39 2007 +0200
+++ b/docs/CHANGES	Wed Apr 18 14:23:35 2007 +0200
@@ -28,6 +28,24 @@
     and improving it and after having made a backup with some other, proven
     method. USE BOTH ON YOUR OWN RISK!
 
+Version 1.7.current:
+    This is the active development branch. All changes get done here and
+    critical stuff gets committed with -m "... (backport needed)" and then
+    backported to older releases that we still maintain. :)
+
+  Developer notes (these should be moved to the end in the release):
+    * ...
+
+  New Features:
+    * ...
+
+  Bugfixes:
+    * ...
+
+  Other changes:
+    * ...
+
+
 Branch moin-1.6-xapian:
   /!\ This needs to be merged together with Franz' CHANGES file into the section
       below.
@@ -59,10 +77,6 @@
 
 
 Version 1.6.current:
-    This is the active development branch. All changes get done here and
-    critical stuff gets committed with -m "... (backport to 1.5)" and then
-    backported to 1.5. :) Commits to 1.5 done in any other way are likely to
-    get reverted.
 
   Developer notes (these should be moved to the end in the release):
     * Page.url() does not escape any more. You have to use wikiutil.escape()