summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS13
-rw-r--r--README3
-rw-r--r--configure.in6
4 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b1325a56..b0f7f3aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-05 Elijah Newren <newren@gmail.com>
+
+ * configure.in:
+ * README:
+ * NEWS:
+ 2.12.0 release
+
2005-09-04 Danilo Å egan <danilo@gnome.org>
* configure.in: Added Armenian (hy) to ALL_LINGUAS.
diff --git a/NEWS b/NEWS
index c960c9ae..e2d78e72 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+2.12.0
+==
+
+Thanks to Brent Smith for finding the crasher in the release candidate!
+
+ - Fix an uninitialized variable problem causing crashes (Brent) [#315000]
+
+Translations
+ Bryn Salisbury (cy), Hendrik Richter (de), Christophe Merlet (RedFox) (fr),
+ Ignacio Casal Quinteiro (gl), Norayr Chilingaryan (hy), Young-Ho Cha (ko),
+ ´ygimantas Berucka (lt), Michiel Sikkes (nl), Leonid Kanter (ru), Danilo
+ ¦egan(sr), Baris Cicek (tr)
+
2.11.3
==
diff --git a/README b/README
index f064c579..db9fb1dd 100644
--- a/README
+++ b/README
@@ -6,7 +6,8 @@ on UNIX keyboards.
The first release of Metacity was version 2.3. Metacity has no need for
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
+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,
+2.12.x.
Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x
diff --git a/configure.in b/configure.in
index 7168e195..fe7b157e 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.11.5],
+AC_INIT([metacity], [2.12.0],
[http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
AC_CONFIG_SRCDIR(src/display.c)
@@ -517,5 +517,5 @@ metacity-$VERSION:
Render: ${have_xrender}
Xcursor: ${have_xcursor}
"
-echo "This is the UNSTABLE branch of metacity"
-echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"
+#echo "This is the UNSTABLE branch of metacity"
+#echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"