From 90b77108344f7de12bbf00792107f84a01c4f4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 15 Oct 2015 19:50:35 +0200
Subject: [PATCH] Bump version to 3.18.1

Update NEWS.
---
 NEWS         | 26 ++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 66c47a98d..daa9b9b13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+3.18.1
+======
+* Fix screen freezes when a notification is pushed [Carlos; #755425]
+* Fix overzealous ellipsization in system status menu [Adel, Florian; #708472]
+* Hide app menu when disabled by setting [Florian; #745919]
+* Fix lightbox effect when animations are disabled [Rui; #755827]
+* Do not mark hotplug notifications as critical [Florian; #657923]
+* Fix icons getting cut off in dash [Florian; #745649]
+* Animate fullscreen/unfullscreen operations [Cosimo; #707248]
+* Misc. bug fixes [Florian, Owen; #748919, #674799, #754581]
+
+Contributors:
+  Emmanuele Bassi, Michael Catanzaro, Cosimo Cecchi, Matthias Clasen,
+  Adel Gadllah, Carlos Garnacho, Ekaterina Gerasimova, Rui Matos,
+  Florian Müllner, Owen W. Taylor
+
+Translations:
+  Марко Костић [sr], Милош Поповић [sr@latin], Khaled Hosny [ar],
+  Trần Ngọc Quân [vi], Petr Kovar [cs], Alexandre Franke [fr],
+  Fran Dieguez [gl], Anders Jonsson [sv], Piotr Drąg [pl], Dušan Kazik [sk],
+  Milo Casagrande [it], Changwoo Ryu [ko], Stas Solovey [ru],
+  Rafael Fontenelle [pt_BR], Tom Tryfonidis [el], Aurimas Černius [lt],
+  Seán de Búrca [ga], Christian Kirbach [de], Jiri Grönroos [fi],
+  Pedro Albuquerque [pt], Baurzhan Muftakhidinov [kk], Daniel Mustieles [es],
+  Marek Černocký [cs], Ask Hjorth Larsen [da], Inaki Larranaga Murgoitio [eu]
+
 3.18.0
 ======
 
diff --git a/configure.ac b/configure.ac
index 80222b119..80d0614e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.18.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.18.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])
 
 AC_CONFIG_HEADERS([config.h])
@@ -77,7 +77,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
 GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.18.0
+MUTTER_MIN_VERSION=3.18.1
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3