summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-07-11 13:31:53 +0000
committerElijah Newren <newren@src.gnome.org>2005-07-11 13:31:53 +0000
commit786af7ea6156dfabb1a95c6b2f643613927992a0 (patch)
tree386ac818108364e14d77d774d06a008a5277ff20
parent8ce054b21ba2058470018a127f0bcf3dc32c1f87 (diff)
downloadmetacity-786af7ea6156dfabb1a95c6b2f643613927992a0.tar.gz
Stuff I forgot to do when I branched an hour or so ago before Matthias'
2005-07-11 Elijah Newren <newren@gmail.com> Stuff I forgot to do when I branched an hour or so ago before Matthias' commit... * configure.in: bump version to 2.11.0. Add UNSTABLE warning. * README: add 2.11.x to the list of unstable branches
-rw-r--r--ChangeLog8
-rw-r--r--README2
-rw-r--r--configure.in6
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e40acb7..72d9a309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-11 Elijah Newren <newren@gmail.com>
+
+ Stuff I forgot to do when I branched an hour or so ago before
+ Matthias' commit...
+
+ * configure.in: bump version to 2.11.0. Add UNSTABLE warning.
+ * README: add 2.11.x to the list of unstable branches
+
2005-07-11 Matthias Clasen <mclasen@redhat.com>
React to cursor theme changes: (#308106)
diff --git a/README b/README
index 1981d4a1..f064c579 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ your petty hangups about version numbers.
The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-, 2.10.x
-Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x
+Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x
COMPILING METACITY
===
diff --git a/configure.in b/configure.in
index 11a614fe..b8326435 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
# Fibonacci sequence for micro version numbering:
# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.10.3],
+AC_INIT([metacity], [2.11.0],
[http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
AC_CONFIG_SRCDIR(src/display.c)
@@ -499,5 +499,5 @@ metacity-$VERSION:
Xsync: ${found_xsync}
Render: ${have_xrender}
"
-#echo "This is the UNSTABLE branch of metacity"
-#echo "Use 2.8.x (where x > 5) for stable (gnome-2-8 branch in CVS)"
+echo "This is the UNSTABLE branch of metacity"
+echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"