From 786af7ea6156dfabb1a95c6b2f643613927992a0 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 11 Jul 2005 13:31:53 +0000 Subject: [PATCH] Stuff I forgot to do when I branched an hour or so ago before Matthias' 2005-07-11 Elijah Newren 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 --- ChangeLog | 8 ++++++++ README | 2 +- configure.in | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e40acb70..72d9a309a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-07-11 Elijah Newren + + 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 React to cursor theme changes: (#308106) diff --git a/README b/README index 1981d4a1d..f064c5791 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 11a614fef..b83264352 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)"