[Xfce4-commits] <xfce4-settings:master> Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
         to 728c2dc255b2ca30ee88c7b58063398fc469e9b6 (commit)
       from 0e123c65c9cd2be0916f374107e9c4104d08c144 (commit)

commit 728c2dc255b2ca30ee88c7b58063398fc469e9b6
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 28 22:48:27 2012 +0200

    Updates for release.

 NEWS            |   24 ++++++++++++++++--------
 configure.ac.in |    6 +++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index b4d3582..b1bd9fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+4.10.0
+======
+- Use the more generic application-x-executable icon for MIME editor.
+- Xsettings ix an alignment problem seen on PPC.
+- Translation updates: English (United Kingdom), Spanish (Castilian),
+  French, Galician, Croatian, Hungarian, Japanese, Kazakh, Korean,
+  Lithuanian, Dutch (Flemish), Portuguese, Romanian, Chinese (China).
+
 4.9.5
 =====
 - Fix display rate matching.
@@ -6,14 +14,14 @@
 - Set Xcursor resources too (bug #8673).
 - Fix typo in appearance error.
 - Add hardcoded fallback if menu is not found.
-- Translation updates: Arabic, Asturian, Bengali, Catalan 
-  (Valencian), Czech, Danish, German, Greek, English (United Kingdom), 
-  Spanish (Castilian), Basque, Finnish, French, Galician, Hebrew, 
-  Croatian, Hungarian, Indonesian, Icelandic, Italian, Japanese, 
-  Kazakh, Korean, Lithuanian, Latvian, Norwegian Bokmal, Dutch 
-  (Flemish), Norwegian Nynorsk, Panjabi (Punjabi), Polish, Portuguese, 
-  Portuguese (Brazilian), Romanian, Russian, Sinhala, Slovak, Swedish, 
-  Telugu, Turkish, Uyghur, Ukrainian, Urdu, Urdu (Pakistan), Chinese 
+- Translation updates: Arabic, Asturian, Bengali, Catalan
+  (Valencian), Czech, Danish, German, Greek, English (United Kingdom),
+  Spanish (Castilian), Basque, Finnish, French, Galician, Hebrew,
+  Croatian, Hungarian, Indonesian, Icelandic, Italian, Japanese,
+  Kazakh, Korean, Lithuanian, Latvian, Norwegian Bokmal, Dutch
+  (Flemish), Norwegian Nynorsk, Panjabi (Punjabi), Polish, Portuguese,
+  Portuguese (Brazilian), Romanian, Russian, Sinhala, Slovak, Swedish,
+  Telugu, Turkish, Uyghur, Ukrainian, Urdu, Urdu (Pakistan), Chinese
   (China), Chinese (Taiwan).
 
 4.9.4
diff --git a/configure.ac.in b/configure.ac.in
index 5e931d4..77127eb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,11 +10,11 @@ dnl ***************************
 dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
-m4_define([xfce4_settings_version_minor], [9])
-m4_define([xfce4_settings_version_micro], [5])
+m4_define([xfce4_settings_version_minor], [10])
+m4_define([xfce4_settings_version_micro], [0])
 m4_define([xfce4_settings_version_nano], [])
 m4_define([xfce4_settings_version_build], [@REVISION@])
-m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
+m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
 m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
 
 dnl *******************************************