2009-04-03 [paul] 3.7.1cvs36

	* m4/Makefile.am
		complete cvs35

diff --git a/ChangeLog b/ChangeLog
index 502601d..a8dc2ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-03 [paul]      3.7.1cvs36
+
+       * m4/Makefile.am
+               complete cvs35
+
 2009-04-03 [paul]      3.7.1cvs35
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index c4afb85..32d93dc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3775,3 +3775,4 @@
 ( cvs diff -u -r 1.20.2.68 -r 1.20.2.69 src/common/utils.h;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/etpan/etpan-thread-manager.c;  ) > 3.7.1cvs33.patchset
 ( cvs diff -u -r 1.20.2.69 -r 1.20.2.70 src/common/utils.h;  ) > 3.7.1cvs34.patchset
 ( cvs diff -u -r 1.654.2.3842 -r 1.654.2.3843 configure.ac;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 m4/aclocal-include.m4;  ) > 3.7.1cvs35.patchset
+( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 m4/Makefile.am;  ) > 3.7.1cvs36.patchset

diff --git a/configure.ac b/configure.ac
index 2a3e8ad..980c17e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/m4/Makefile.am b/m4/Makefile.am
index ecce704..6bde79b 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,5 +1,4 @@
 MACROS = \
-       aclocal-include.m4 \
        check-type.m4 \
        gnupg-check-typedef.m4 \
        aspell.m4 \