Update end-user version numbers to suit new merged status.

git-svn-id: http://svn.osgeo.org/qgis/trunk@3692 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 3, 2005 · 1da6a6d · 1da6a6d
1 parent ac10199
commit 1da6a6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,7 +2,9 @@
 ------------------------------------------------------------------------------
 Version 0.6 'Simon' .... development version
 QGIS Change Log
-2005-05-23 [gsherman 0.7rc1
+2005-07-03 [morb_au] 0.7.devel2
+** Merged changes in the 0.7 release candidate branch (as at "Release-0_7-candidate-pre1") back into the trunk.
+2005-05-23 [gsherman] 0.7rc1
 ** Fixed bookmarks bug related to non-existent user database. The
    database is now properly created if it doesn't exist.
 2005-04-12 [timlinux] 0.6devel26

diff --git a/configure.in b/configure.in
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=7
 MICRO_VERSION=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else