summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2007-03-05 16:29:20 +0000
committerRay Strode <halfline@src.gnome.org>2007-03-05 16:29:20 +0000
commitf43fb8d4fbe5c4e2d03f2d8e3f1672566da373f6 (patch)
tree11f9ef456a9fafddb3532e5f3aa8a07a7c41a653
parent9ccaf1f489477a8a098dbad7f5c93a78facf7939 (diff)
downloadgconf-f43fb8d4fbe5c4e2d03f2d8e3f1672566da373f6.tar.gz
============================= 2.18.0.1 ====================GCONF_2_18_0_1
2007-03-02 Ray Strode <rstrode@redhat.com> * configure.in: drop release number to 2.18.0.1 * NEWS: update for release svn path=/trunk/; revision=2383
-rw-r--r--ChangeLog9
-rw-r--r--NEWS8
-rw-r--r--configure.in4
3 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b65516e..9888f75c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+
+============================= 2.18.0.1 ====================
+
+2007-03-02 Ray Strode <rstrode@redhat.com>
+
+ * configure.in: drop release number to 2.18.0.1
+
+ * NEWS: update for release
+
2007-03-05 Ray Strode <rstrode@redhat.com>
Patch from Loïc Minier to take care of fallout from
diff --git a/NEWS b/NEWS
index a3cfa254..174393ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+2.18.0.1
+========
+
+ Misc
+ - Don't fail db sync operations and leave %gconf-tree.xml.new
+ files laying around if there wasn't a %gconf-tree.xml to start
+ with (Loïc Minier)
+
2.18.0
======
diff --git a/configure.in b/configure.in
index 5b21bcc3..72293d16 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(gconf/gconf.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GConf, 2.18.1)
+AM_INIT_AUTOMAKE(GConf, 2.18.0.1)
AM_MAINTAINER_MODE
@@ -78,7 +78,7 @@ GCONF_CURRENT=5
dnl increment any time the source changes; set to
dnl 0 if you increment CURRENT
-GCONF_REVISION=1
+GCONF_REVISION=2
dnl increment if any interfaces have been added; set to 0
dnl if any interfaces have been removed. removal has