[Xfce4-commits] <xfce4-settings:bluesabre/display-settings> Updates for release.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
         to a3bb8f448906ebed565554db6c25483f97f4971f (commit)
       from fc4b398313f651d8da1db549a57b84e81f753156 (commit)

commit a3bb8f448906ebed565554db6c25483f97f4971f
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Sep 23 19:43:58 2013 +0200

    Updates for release.

 NEWS            |   23 +++++++++++++++++++----
 configure.ac.in |    4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index e135c6d..df9869e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,23 @@
-4.11.x
+4.11.1
 ======
-- Automatically re-enable Laptop-displays if all other displays get disconnected
-- Add option to automatically show minimal-display dialog when new display gets connected
-- Fix bugs with mnemonic accelerators (bugs #9302 and #9308)
+- Automatically re-enable Laptop-displays if all other displays
+  get disconnected.
+- Add option to automatically show minimal-display dialog when new
+  display gets connected.
+- Fix bugs with mnemonic accelerators (bugs #9302 and #9308).
+- Rework accelerators (bugs #9302 and #9308).
+- Autotools updates.
+- Make touchpad type delay configurable (bug #8948).
+- Mention no cache file for icon themes.
+- Translation updates: Arabic, Asturian, Bulgarian, 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, Serbian,
+  Swedish, Telugu, Thai, Turkish, Uyghur, Ukrainian, Urdu, Urdu
+  (Pakistan), Chinese (China), Chinese (Taiwan).
 
 4.11.0
 ======
diff --git a/configure.ac.in b/configure.ac.in
index b7b93f8..07ae822 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,10 +11,10 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [11])
-m4_define([xfce4_settings_version_micro], [0])
+m4_define([xfce4_settings_version_micro], [1])
 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 *******************************************