From: Hoà Viêt Dinh <dinh.viet.hoa@free.fr>
Date: Sun, 3 Jul 2005 16:46:33 +0000 (+0000)
Subject: merged imap branch
X-Git-Tag: rel_1_9_13~87
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1ef8a622fbcddf9fdc81244759a38eb15889e7d9

merged imap branch
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e27622708..3b238778d 100644
--- 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 8c691b5f8..1042f247d 100644
--- 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=