merged imap branch

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e27622708c8f1d89b8fa7fb97d9dec2a8ea03bff..3b238778d9e603f02ff186c0b75e39287f3140ac 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,19 @@
+2005-07-03 [hoa]       1.9.12cvs11
+
+       * src/etpan/Makefile.am
+       * src/etpan/etpan-errors.h
+       * src/etpan/etpan-log.[ch]
+       * src/etpan/etpan-thread-manager-types.h
+       * src/etpan/etpan-thread-manager.[ch]
+       * src/etpan/imap-thread.[ch]
+       * src/Makefile.am
+       * src/imap.c
+       * src/main.c
+       * src/prefs_other.c
+       * configure.ac
+           merged imap branch.
+           dependency on libetpan 0.37 is now added.
+
 2005-07-01 [colin]     1.9.12cvs10
 
        * src/Makefile.am

diff --git a/configure.ac b/configure.ac
index 8c691b5f89f7a20e77785e6bbac0891f59addb80..1042f247dce4ad1e4836c73725ddb88903fdcb93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=