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

[Nick Schermer]

Updating branch refs/heads/master
         to 2b607f0889cc182e0639dfd4c3f15f7bd7ab6368 (commit)
       from 4ffb6ed610c370af9fe17a5f7b0d713a05f2c25a (commit)

commit 2b607f0889cc182e0639dfd4c3f15f7bd7ab6368
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Dec 3 20:55:12 2010 +0100

    Updates for release.

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

diff --git a/NEWS b/NEWS
index 55a6a5c..9856635 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Xfconf 4.7.4
+============
+
+  * Don't enable options with --disable-<option> (bug #6820).
+  * Updated translations: ug, sk, pt.
+
 Xfconf 4.7.3
 ============
 
diff --git a/configure.ac.in b/configure.ac.in
index ecf9197..484982a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,10 +10,10 @@ m4_define([libxfconf_verinfo], [2:0:0])
 m4_define([libxfconf_version_api], [0])
 m4_define([xfconf_version_major], [4])
 m4_define([xfconf_version_minor], [7])
-m4_define([xfconf_version_micro], [3])
+m4_define([xfconf_version_micro], [4])
 m4_define([xfconf_version_nano], [])
 m4_define([xfconf_version_build], [@REVISION@])
-m4_define([xfconf_version_tag], [git])
+m4_define([xfconf_version_tag], [])
 m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [git], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])])
 
 m4_define([xfconf_default_debug], [ifelse(xfconf_version_tag(), [git], [yes], [minimum])])