From df027e480bcd53164fad2cf36f2094a36ab8bc33 Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Tue, 5 Apr 2016 15:42:32 +0300
Subject: update NEWS and pack 1.13.x changes into single 1.14.0 entry

---
 NEWS | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 7d38780..dc16b50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
-1.13.1
-
-1.13.0
-  * GTK3: several deprecation fixes
-  * Add setting to enable/disable the osd
-  * fix some build warnings
-  * drop MateConf migration script
+1.14.0
+  * Drop MateConf migration script
+  * media-keys: add setting to enable/disable OSD
+  * touchpad: support edge and two-finger scrolling independently
+    (use separate GSettings keys for them)
+  * xsettings: add settings for cursor theme and size
+  * GTK+3: several deprecation fixes
+  * Some more fixes and cleanups
+  * Translations update
 
 1.12.1
   * xrandr: install icon in correct directory
-- 
cgit v1.2.1