talons

commit 6dee9fb1323559406dd8b7c0b236c792176f6572
parent 5fa5f3c53bbe6b9efa6fc4b53894bcd15ab2bfb2
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Wed, 25 Jul 2012 19:18:04 +0000

2012-07-25 [ticho]	3.8.1cvs19

	* manual/advanced.xml
		Add the three hidden preferences related to colored display
		of unified diffs to manual.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
manual/advanced.xml
 | 
10
++++++++++

4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-25 [ticho]	3.8.1cvs19
+
+	* manual/advanced.xml
+		Add the three hidden preferences related to colored display
+		of unified diffs to manual.
+
 2012-07-25 [ticho]	3.8.1cvs18
 
 	* src/gtk/gtkaspell.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4393,3 +4393,4 @@
 ( cvs diff -u -r 1.1.2.110 -r 1.1.2.111 src/gtk/quicksearch.c;  ) > 3.8.1cvs16.patchset
 ( cvs diff -u -r 1.12.2.60 -r 1.12.2.61 src/gtk/prefswindow.c;  ) > 3.8.1cvs17.patchset
 ( cvs diff -u -r 1.9.2.78 -r 1.9.2.79 src/gtk/gtkaspell.c;  ) > 3.8.1cvs18.patchset
+( cvs diff -u -r 1.1.2.60 -r 1.1.2.61 manual/advanced.xml;  ) > 3.8.1cvs19.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/manual/advanced.xml b/manual/advanced.xml
@@ -877,6 +877,16 @@
 	  </para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term><literal>diff_added_color</literal></term>
+	<term><literal>diff_deleted_color</literal></term>
+	<term><literal>diff_hunk_color</literal></term>
+	<listitem>
+		<para>
+	Colors to use when displaying attachments in unified diff format.
+		</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </section>
   <section id="adv_autofaces">