Merge from 2.0.1

svn: r4666
2005-05-24 13:08:06 +00:00
parent 62c65fb454
commit d7ce524379
73 changed files with 21569 additions and 14199 deletions
--- a/configure.in
+++ b/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.57)
 AC_INIT(gramps, 2.1.0, gramps-bugs@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(src/gramps.py)
 AM_INIT_AUTOMAKE(1.6.3)
-dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
-RELEASE=1
+RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
+dnl RELEASE=1

 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"