diff --git a/ChangeLog b/ChangeLog index 151e67d9..e39fe778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-19 Havoc Pennington + + * configure.in: add note about how this is the unstable branch, + set version to 2.5.0 + 2003-01-14 Havoc Pennington * 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)"