From 788203a841e4a2820b7f431e816a2e86d347b8b2 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 4 Feb 2014 15:23:54 +0100
Subject: [PATCH] 3.11.5

---
 NEWS         | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index a82dbf3d3..0bc76d99b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,54 @@
+==============
+Version 3.11.5
+==============
+
+Shell:
+- Activate application when launching a panel
+- Disable type-ahead in search window
+- Fix headerbar item positions following gtk+ headerbar changes
+
+Background:
+- The chooser should have exactly 3 columns
+- Add PNM and JPEG 2000 to the list of valid content types
+- Add a placeholder icon before creating thumbnails
+
+Date & Time:
+- Set the filechooser clock format too
+
+Display:
+- Hide Size label when empty
+- Only show rotation options if we support them
+
+Info:
+- Fix possible crasher when exiting panel
+
+Network:
+- Add a Team type to connection editor
+- Give an empty title to the hotspot dialog
+- Hide hotspot dialog on Escape
+
+Notifications:
+- Fix invalid format string
+
+Online Accounts:
+- Mention Pocket in the keywords
+
+Power:
+- If battery is fully charged but 99%, just round it up
+
+Printers:
+- Show correct time of print job
+- Plug a memory leak
+
+Privacy:
+- Fix the alignment of the combobox in the Screen Lock dialog
+
+Region:
+- Do not show Login button if localed is not available
+
+Users:
+- Improve logged-in check when deleting users to catch console logins
+
 ==============
 Version 3.11.3
 ==============
diff --git a/configure.ac b/configure.ac
index 3991b20c2..7a07dd8c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-m4_define([gnome_control_center_version], 3.11.3)
+m4_define([gnome_control_center_version], 3.11.5)
 AC_INIT([gnome-control-center], [gnome_control_center_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])