2009-03-30 [colin] 3.7.1cvs30

[claws.git] / PATCHSETS

diff --git a/PATCHSETS b/PATCHSETS
index 15bd81debbb68ca8c1480949216ff4e8e6dba501..a1848069037045f394a07250f9bc755e85115bad 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3764,9 +3764,9 @@
 ( cvs diff -u -r 1.43.2.107 -r 1.43.2.108 src/toolbar.c;  cvs diff -u -r 1.36.2.168 -r 1.36.2.169 src/common/utils.c;  ) > 3.7.1cvs22.patchset
 ( cvs diff -u -r 1.654.2.3830 -r 1.654.2.3831 configure.ac;  ) > 3.7.1cvs23.patchset
 ( cvs diff -u -r 1.96.2.217 -r 1.96.2.218 src/textview.c;  ) > 3.7.1cvs24.patchset
-<<<<<<< PATCHSETS
-( cvs diff -u -r 1.654.2.3833 -r 1.654.2.3834 configure.ac;  ) > 3.7.1cvs26.patchset
-=======
 ( cvs diff -u -r 1.101.2.60 -r 1.101.2.61 src/news.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/etpan/nntp-thread.c;  ) > 3.7.1cvs25.patchset
->>>>>>> 1.1.2.3777
+( cvs diff -u -r 1.654.2.3833 -r 1.654.2.3834 configure.ac;  ) > 3.7.1cvs26.patchset
 ( cvs diff -u -r 1.179.2.244 -r 1.179.2.245 src/imap.c;  ) > 3.7.1cvs27.patchset
+( cvs diff -u -r 1.213.2.191 -r 1.213.2.192 src/folder.c;  ) > 3.7.1cvs28.patchset
+( cvs diff -u -r 1.179.2.245 -r 1.179.2.246 src/imap.c;  ) > 3.7.1cvs29.patchset
+( cvs diff -u -r 1.213.2.192 -r 1.213.2.193 src/folder.c;  cvs diff -u -r 1.87.2.59 -r 1.87.2.60 src/folder.h;  cvs diff -u -r 1.179.2.246 -r 1.179.2.247 src/imap.c;  cvs diff -u -r 1.274.2.300 -r 1.274.2.301 src/mainwindow.c;  cvs diff -u -r 1.39.2.55 -r 1.39.2.56 src/mainwindow.h;  cvs diff -u -r 1.105.2.151 -r 1.105.2.152 src/prefs_account.c;  cvs diff -u -r 1.49.2.42 -r 1.49.2.43 src/prefs_account.h;  cvs diff -u -r 1.395.2.409 -r 1.395.2.410 src/summaryview.c;  cvs diff -u -r 1.68.2.51 -r 1.68.2.52 src/summaryview.h;  ) > 3.7.1cvs30.patchset