2009-03-30 [colin] 3.7.1cvs29

[claws.git] / PATCHSETS

diff --git a/PATCHSETS b/PATCHSETS
index 9af3b9a35627e171900a1d4b2715a8ea22481fa2..4da5a2872adf9f33e1d7f6404669ef0ffb29b559 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3764,3 +3764,11 @@
 ( 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.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