From aaa2833901fa51f4a2a30f43faf00981c7268327 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Wed, 16 Apr 2014 14:44:08 +0200
Subject: [PATCH] 3.12.1

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

diff --git a/NEWS b/NEWS
index e16aea36e..c37da3386 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,27 @@
+==============
+Version 3.12.1
+==============
+
+Background:
+- Remove black from the preset colours
+- Make sure the whole dialog is visible on small screens
+
+Info:
+- Fix incorrect virtualisation technology being displayed
+- Don't display "Check for updates" button when neither gnome-software
+  nor gpk-update-viewer are available
+
+Printers:
+- Don't fail when adding Samba printers with spaces on their name
+
+Users:
+- Fix hang on password change
+
+Wacom:
+- Unconditionally build the panel on supported platforms
+
+- Translations update
+
 ==============
 Version 3.12.0
 ==============
diff --git a/configure.ac b/configure.ac
index c831e0d47..511f78dee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-m4_define([gnome_control_center_version], 3.12.0)
+m4_define([gnome_control_center_version], 3.12.1)
 AC_INIT([gnome-control-center], [gnome_control_center_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])