From 6d89e785474a540001b8c0efa9a7aa7282d34789 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 29 Oct 2004 07:20:10 +0000
Subject: [PATCH] sync with HEAD

---
 ChangeLog.claws   | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 tools/Makefile.am |  6 ++++++
 2 files changed, 59 insertions(+)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 403c5dea2..ff5142565 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,56 @@
+2004-10-29 [paul]
+
+	* tools/kdeservicemenu/template_sylpheed-attach-files.desktop
+	* tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
+		add French translations, submitted by Fabien Vantard
+
+2004-10-28 [christoph]	0.9.12cvs135
+
+	* doc/src/rfc2231.txt				** NEW **
+	* src/procmime.c
+	* src/common/quoted-printable.c
+	* src/common/utils.[ch]
+		implement RFC2231's parameter decoding
+
+2004-10-27 [paul]
+
+	* tools/kdeservicemenu/README
+	* tools/kdeservicemenu/install.sh
+	* tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
+	* tools/kdeservicemenu/template_sylpheed-attach-files.desktop
+	* tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
+		output files to /tmp instead of littering the
+		current dir
+		add uninstall function
+		refactor
+
+2004-10-26 [christoph]	0.9.12cvs134
+
+	* src/procmime.c
+		better check if parameters have to be in quoted string
+
+2004-10-25 [paul]
+
+	* tools/kdeservicemenu/README
+	* tools/kdeservicemenu/install.sh
+	* tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
+	* tools/kdeservicemenu/template_sylpheed-attach-files.desktop
+	* tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
+		add files for Sylpheed Service Menu in Konqueror
+
+2004-10-22 [paul]	0.9.12cvs133
+
+	* src/compose.c
+	* src/prefs_common.c
+	* src/prefs_common.h
+	* src/prefs_wrapping.c
+		remove 'smart wrapping'
+
+2004-10-21 [colin]	0.9.12cvs132
+
+	* src/compose.c
+		Remove extraneous separator in Options
+
 2004-10-21 [colin]	0.9.12cvs131
 
 	* src/compose.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2417e9222..3ab224c49 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_TOOLS = \
 	sylprint.pl \
 	sylprint.rc \
 	tb2sylpheed \
+	textviewer.sh \
         update-po \
 	uudec \
 	vcard2xml.py
@@ -28,6 +29,11 @@ EXTRA_DIST = \
 	README \
 	README.sylprint \
 	multiwebsearch.conf \
+	kdeservicemenu/README \
+	kdeservicemenu/install.sh \
+	kdeservicemenu/sylpheed-kdeservicemenu.pl \
+	kdeservicemenu/template_sylpheed-attach-files.desktop \
+	kdeservicemenu/template_sylpheed-compress-attach.desktop \
 	$(EXTRA_TOOLS)
 
 MAKE_EXE = chmod u+x $(EXTRA_TOOLS)
-- 
2.25.1