2009-04-02 [colin] 3.7.1cvs33

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fb7f1849e01792d8387736c8f6f96b129a05a56f..ec40724d95e17b1829088e859e6c7ca863d6ff6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -86,11 +86,7 @@ AM_PROG_LEX
 AC_PROG_YACC
 AC_LIB_PREFIX
 AC_LIBTOOL_WIN32_DLL
-<<<<<<< configure.ac
-dnl LT_AC_PROG_RC
-=======
 LT_AC_PROG_RC
->>>>>>> 1.654.2.3832
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL