2009-03-06 [wwp] 3.7.1cvs2

	* src/compose.c
	* src/folder_item_prefs.c
	* src/folder_item_prefs.h
	* src/prefs_folder_item.c
		Add per-folder default cc, bcc and reply-to.

diff --git a/ChangeLog b/ChangeLog
index 0c3def77e67fcd4f6f9aec35c1d767a806b14344..262ba88551b899725c04040f157bfca9bce4f5b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-06 [wwp]       3.7.1cvs2
+
+       * src/compose.c
+       * src/folder_item_prefs.c
+       * src/folder_item_prefs.h
+       * src/prefs_folder_item.c
+               Add per-folder default cc, bcc and reply-to.
+
 2009-03-06 [colin]     3.7.1cvs1
 
        * src/gedit-print.c

diff --git a/PATCHSETS b/PATCHSETS
index 443dbfbcff45c2bbbbd675c053d681953a24d2b5..c6527d384c2e5962d9d9eabc90a8d873a84b5110 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3741,3 +3741,4 @@
 ( cvs diff -u -r 1.59.2.78 -r 1.59.2.79 src/prefs_filtering.c;  ) > 3.7.0cvs77.patchset
 ( cvs diff -u -r 1.9.2.14 -r 1.9.2.15 po/cs.po;  cvs diff -u -r 1.58.2.42 -r 1.58.2.43 po/de.po;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 po/fi.po;  cvs diff -u -r 1.42.2.45 -r 1.42.2.46 po/fr.po;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 po/hu.po;  cvs diff -u -r 1.28.2.12 -r 1.28.2.13 po/nl.po;  cvs diff -u -r 1.50.2.34 -r 1.50.2.35 po/pt_BR.po;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 po/sv.po;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 po/zh_CN.po;  ) > 3.7.0cvs78.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gedit-print.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtksourceprintjob.c;  ) > 3.7.1cvs1.patchset
+( cvs diff -u -r 1.487 -r 1.488 src/compose.c;  cvs diff -u -r 1.10 -r 1.11 src/folder_item_prefs.c;  cvs diff -u -r 1.6 -r 1.7 src/folder_item_prefs.h;  cvs diff -u -r 1.65 -r 1.66 src/prefs_folder_item.c;  ) > 3.7.1cvs2.patchset

diff --git a/configure.ac b/configure.ac
index 9b518ffdf6aa82635d838974fe65f7058a2d3827..662e5d93a974b8a14d8ca62333659eb499fe4b3d 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=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=