From: Paul Mangan Date: Thu, 15 May 2008 09:06:28 +0000 (+0000) Subject: 2008-05-15 [paul] 3.4.0cvs38 X-Git-Tag: rel_3_5_0~82 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6651694fa0ed70b4e999027e29187d90030d637c;hp=bd9a3ef593690c02d352f407c864206768180e5e;ds=inline 2008-05-15 [paul] 3.4.0cvs38 * manual/advanced.xml fix typo --- diff --git a/ChangeLog b/ChangeLog index 07448341d..845f43d13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 [paul] 3.4.0cvs38 + + * manual/advanced.xml + fix typo + 2008-05-15 [paul] 3.4.0cvs37 * manual/advanced.xml diff --git a/PATCHSETS b/PATCHSETS index d2b5f0be5..24450abcf 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3333,3 +3333,4 @@ ( cvs diff -u -r 1.382.2.449 -r 1.382.2.450 src/compose.c; cvs diff -u -r 1.204.2.169 -r 1.204.2.170 src/prefs_common.c; cvs diff -u -r 1.103.2.107 -r 1.103.2.108 src/prefs_common.h; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_send.c; ) > 3.4.0cvs35.patchset ( cvs diff -u -r 1.115.2.194 -r 1.115.2.195 src/main.c; cvs diff -u -r 1.274.2.240 -r 1.274.2.241 src/mainwindow.c; cvs diff -u -r 1.39.2.44 -r 1.39.2.45 src/mainwindow.h; ) > 3.4.0cvs36.patchset ( cvs diff -u -r 1.1.2.47 -r 1.1.2.48 manual/advanced.xml; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_send.c; ) > 3.4.0cvs37.patchset +( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 manual/advanced.xml; ) > 3.4.0cvs38.patchset diff --git a/configure.ac b/configure.ac index 9c3219b66..193044d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=37 +EXTRA_VERSION=38 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/advanced.xml b/manual/advanced.xml index 8a2dc091d..667cbfaca 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -651,7 +651,7 @@ 0 or 1. The outgoing encoding of a message will use 7bit US-ASCII whenever it is suitable for the message content, ignoring the Outgoing Encoding option unless it is necessary. Turning this - option off forces the user-defined content to be used, regardless + option off forces the user-defined encoding to be used, regardless of message content. Default is 1, turned on.