From: Colin Leroy <colin@colino.net>
Date: Wed, 24 Sep 2008 16:51:13 +0000 (+0000)
Subject: 2008-09-24 [colin]	3.5.0cvs127
X-Git-Tag: rel_3_6_0~22
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1406ea8ee334a167066df70e4dd82a0cf013e241

2008-09-24 [colin]	3.5.0cvs127

	* src/codeconv.c
		Add nb_NO's charset (iso-8859-1)
---

diff --git a/ChangeLog b/ChangeLog
index 6f9092f43..ba793fb4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-24 [colin]	3.5.0cvs127
+
+	* src/codeconv.c
+		Add nb_NO's charset (iso-8859-1)
+
 2008-09-24 [colin]	3.5.0cvs126
 
 	* src/common/utils.c
diff --git a/PATCHSETS b/PATCHSETS
index 2d992670f..d46abe083 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3538,3 +3538,4 @@
 ( cvs diff -u -r 1.382.2.479 -r 1.382.2.480 src/compose.c;  cvs diff -u -r 1.274.2.274 -r 1.274.2.275 src/mainwindow.c;  cvs diff -u -r 1.94.2.187 -r 1.94.2.188 src/messageview.c;  ) > 3.5.0cvs124.patchset
 ( cvs diff -u -r 1.115.2.206 -r 1.115.2.207 src/main.c;  cvs diff -u -r 1.1.2.75 -r 1.1.2.76 src/wizard.c;  ) > 3.5.0cvs125.patchset
 ( cvs diff -u -r 1.36.2.149 -r 1.36.2.150 src/common/utils.c;  ) > 3.5.0cvs126.patchset
+( cvs diff -u -r 1.65.2.60 -r 1.65.2.61 src/codeconv.c;  ) > 3.5.0cvs127.patchset
diff --git a/configure.ac b/configure.ac
index 0c638b972..43c4ed85b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=126
+EXTRA_VERSION=127
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/codeconv.c b/src/codeconv.c
index 545998d63..64d88283f 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1107,6 +1107,7 @@ static const struct {
 	{"ms_MY"	, C_ISO_8859_1	, C_ISO_8859_1},
 	{"nl_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
 	{"nl_NL"	, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nb_NO",	, C_ISO_8859_1  , C_ISO_8859_1},
 	{"nn_NO"	, C_ISO_8859_1	, C_ISO_8859_1},
 	{"no_NO"	, C_ISO_8859_1	, C_ISO_8859_1},
 	{"oc_FR"	, C_ISO_8859_1	, C_ISO_8859_1},