summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2003-01-19 23:07:30 +0000
committerHavoc Pennington <hp@src.gnome.org>2003-01-19 23:07:30 +0000
commit4b18f649145e058b15e90b2f03205bad69422b84 (patch)
tree058dabf7cab5e9c8080e8ba333286a39cefac0d7
parent1e6a8a31d1f03333fb229370bc88f284990fea61 (diff)
downloadmetacity-4b18f649145e058b15e90b2f03205bad69422b84.tar.gz
add note about how this is the unstable branch, set version to 2.5.0
2003-01-19 Havoc Pennington <hp@pobox.com> * configure.in: add note about how this is the unstable branch, set version to 2.5.0
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 151e67d9..e39fe778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-19 Havoc Pennington <hp@pobox.com>
+
+ * configure.in: add note about how this is the unstable branch,
+ set version to 2.5.0
+
2003-01-14 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_maximize, meta_window_unmaximize)
diff --git a/configure.in b/configure.in
index 6be1af64..9d86c02d 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
# releases on a branch add a 4th version like 2.4.21.1
-AM_INIT_AUTOMAKE(metacity, 2.4.13)
+AM_INIT_AUTOMAKE(metacity, 2.5.0) ## note, haven't released 2.5.0
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -381,3 +381,4 @@ metacity-$VERSION:
Xsync: ${found_xsync}
Deprecated config dialog: ${enable_config_dialog}
"
+echo "This is the UNSTABLE branch of metacity, use 2.4.x for stable (gnome-2-2 branch in CVS)"