From b7de724eaf6c12c7781588a62f9837f40b6d3b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Sat, 14 Jun 2014 15:56:36 +0300
Subject: Bump version to 3.12.0 Update NEWS

---
 NEWS         | 38 ++++++++++++++++++++++++++++++++++++++
 configure.ac |  8 +++-----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 4b37437c..d10f3a10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,41 @@
+Version 3.12.0
+==============
+ - Port GTK+ 2 to GTK+ 3 (Mutter developers)
+ - Fix title bar button background (Nicolas Desfontaine)
+ - Side-by-side window tiling (Maarten Baert)
+ - Window placement patch (Chad Glendenin, http://chad.glendenin.com/metacity/patch.html)
+ - Add UXD shadows and borders (Sam Spilsbury)
+ - Add error handling to glibtop_get_proc_uid (Tomaž Šolc)
+ - Cut with fading the Bar title when it's longer than the decoration bar (Marco Trevisan)
+ - Don't show the ws switcher if we only have one (Didier Roche)
+ - Update meta_show_dialog for gtk's removal of --screen (Dan Winship)
+ - Add drag and drop support when using alt + tab (Matthias Clasen)
+ - Fix new window focus (https://bugzilla.gnome.org/show_bug.cgi?id=534752)
+ - Compositing manager is enabled by default now
+ - Fix screen flickering on session start (https://bugzilla.gnome.org/show_bug.cgi?id=658036)
+
+Translations:
+    Piotr Drąg (pl)
+    Lasse Liehu (fi)
+    Wylmer Wang (zh_CN)
+    Rafael Ferreira (pt_BR)
+    Benjamin Steinwender (de)
+    Мирослав Николић (sr, sr@latin)
+    Rūdolfs Mazurs (lv)
+    Joe Hansen (da)
+    Milo Casagrande (it)
+    Balázs Úr (hu)
+    Alexandre Franke (fr)
+    Aurimas Černius (lt)
+    Christian Kirbach (de)
+    Andika Triwidada (id)
+    Matej Urbančič (sl)
+    Daniel Mustieles (es)
+    Marek Černocký (cs)
+    Gil Forcada (ca)
+    Fran Diéguez (gl)
+    Gheyret Kenji (ug)
+
 Version 2.34.13
 ===============
 
diff --git a/configure.ac b/configure.ac
index 5b480b38..985038cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,8 @@
 AC_PREREQ(2.50)
 
-m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [34])
-# Fibonacci sequence for micro version numbering:
-# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [21])
+m4_define([metacity_major_version], [3])
+m4_define([metacity_minor_version], [12])
+m4_define([metacity_micro_version], [0])
 
 m4_define([metacity_version],
           [metacity_major_version.metacity_minor_version.metacity_micro_version])
-- 
cgit v1.2.1