[Xfce4-commits] r29827 - xfce4-settings/trunk

[Stephan Arts]

Author: stephan
Date: 2009-04-18 14:15:53 +0000 (Sat, 18 Apr 2009)
New Revision: 29827

Modified:
   xfce4-settings/trunk/NEWS
   xfce4-settings/trunk/configure.ac.in
Log:
== Xfce 4.6.1 Released! ==


Modified: xfce4-settings/trunk/NEWS
===================================================================
--- xfce4-settings/trunk/NEWS	2009-04-18 14:13:25 UTC (rev 29826)
+++ xfce4-settings/trunk/NEWS	2009-04-18 14:15:53 UTC (rev 29827)
@@ -6,6 +6,9 @@
   hotplugging in the code (bug #5084).
 - Remove unsigned clamp macro that broke applying the display settings
   and select the correct refresh rate (bug #4966).
+- Make sure that the same .desktop file does not appear in the settings-
+  manager more then once if it occurs in different locations in XDG_DATA_DIRS
+  (bug #5159)
 
 4.6.0
 =====

Modified: xfce4-settings/trunk/configure.ac.in
===================================================================
--- xfce4-settings/trunk/configure.ac.in	2009-04-18 14:13:25 UTC (rev 29826)
+++ xfce4-settings/trunk/configure.ac.in	2009-04-18 14:15:53 UTC (rev 29827)
@@ -11,7 +11,7 @@
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [6])
-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], [r at REVISION@])
 m4_define([xfce4_settings_version_tag], []) # Leave empty for releases