changeset 3739:7be635a60e9c

merge 1.7
author Johannes Berg <johannes AT sipsolutions DOT net>
date Sat, 21 Jun 2008 22:06:11 +0200
parents ecbac939d1e5 (diff) 61ca04aca385 (current diff)
children 67e6b9620ae0
files docs/CHANGES
diffstat 3 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/version.py	Sat Jun 21 21:27:56 2008 +0200
+++ b/MoinMoin/version.py	Sat Jun 21 22:06:11 2008 +0200
@@ -15,8 +15,8 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release = '1.7.0rc3'
-release_short = '170' # used for url_prefix_static
+release = '1.8.0alpha'
+release_short = '180' # used for url_prefix_static
 revision = patchlevel
 
 def update():
--- a/docs/CHANGES	Sat Jun 21 21:27:56 2008 +0200
+++ b/docs/CHANGES	Sat Jun 21 22:06:11 2008 +0200
@@ -31,6 +31,12 @@
     USE BOTH ON YOUR OWN RISK!
 
 
+Version 1.8.0current:
+
+  Bug Fixes:
+    * ...
+
+
 Version 1.7.0current:
   Note: This is a reduced CHANGES, ommitting details from rc/beta test and
         also less interesting minor changes and fixes. It shows changes
--- a/moin.spec	Sat Jun 21 21:27:56 2008 +0200
+++ b/moin.spec	Sat Jun 21 22:06:11 2008 +0200
@@ -1,6 +1,6 @@
 %define name moin
-%define version 1.7.0
-%define release 0.5.rc3
+%define version 1.8.0
+%define release 0.0.alpha
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
 #         Patched