Updating branch refs/heads/master to 6b4f14c9535e58fe2e7edabfa67902224bbdfad4 (commit) from 784f97d3a70372996ba28a160ea87e95861dab6f (commit)
commit 6b4f14c9535e58fe2e7edabfa67902224bbdfad4 Author: Eric Koegel <eric.koe...@gmail.com> Date: Sat Nov 2 08:52:30 2013 +0300 Revert "Updates for release." Failed to update xfdesktop_version_micro This reverts commit 784f97d3a70372996ba28a160ea87e95861dab6f. NEWS | 32 -------------------------------- configure.ac.in | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/NEWS b/NEWS index 4dbfc8f..b45d5b4 100644 --- a/NEWS +++ b/NEWS @@ -1,35 +1,3 @@ -4.11.1 -====== -- Wrong g_return_if_fail macro used -- Fix icon moves and deletions -- Don't cache the pixbufs in single workspace mode -- Clear all pixels from drag highlight box (Bug 10450) -- Speed up template sub-menu loading code (Bug 7834) -- Always move files from the trash (Bug 3983) -- Fix template sub-menu loading code (Bug 10138) -- Fix menu popups via the command line -- Use the Path key of desktop files if a path is not set (Bug #8741) -- Correctly display settings defaults -- Fix some memory leaks -- Include the chronological option in the combobox -- Allow the font size to go to 0. -- Tooltip options in xfdesktop-settings -- Add a chronological backdrop cycle option -- Additonal backdrop cycle options -- More removable device icon types (Bug 4056) -- Add icons in an idle callback -- Right click issues persist (Bug 9323) -- Migrate backdrop settings from previous versions (Bug 10380) -- Set warnings as fatal -- Update manpage (Bug 7576) -- Allow renaming of multiple icons -- Translation updates: Arabic (ar), Bulgarian (bg), Chinese (China) (zh_CN), - Chinese (Taiwan) (zh_TW), Dutch (Flemish) (nl), English (Australia) (en_AU), - French (fr), Hungarian (hu), Icelandic (is), Italian (it), Kazakh (kk), - Korean (ko), Polish (pl), Portuguese (pt), Portuguese (Brazilian) (pt_BR), - Russian (ru), Serbian (sr), Spanish (Castilian) (es), Thai (th), - Turkish (tr), Ukrainian (uk), and Uzbek (uz) - 4.11.0 ====== - No need to remove the thumbnail if we're removing the icon diff --git a/configure.ac.in b/configure.ac.in index 621cce8..8f0a05b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,7 +9,7 @@ m4_define([xfdesktop_version_minor], [11]) m4_define([xfdesktop_version_micro], [0]) m4_define([xfdesktop_version_nano], []) m4_define([xfdesktop_version_build], [@REVISION@]) -m4_define([xfdesktop_version_tag],[]) +m4_define([xfdesktop_version_tag],[git]) m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])]) dnl minimum required versions _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits