From 016d6a64c644db048c39ea943c110f50773f3bbb Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Fri, 12 Aug 2016 21:35:54 +0200
Subject: [PATCH] update to 1.14.1 release

---
 .gitignore                | 1 +
 mate-settings-daemon.spec | 9 ++++++++-
 sources                   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a72bc2e..9507655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /mate-settings-daemon-1.12.0.tar.xz
 /mate-settings-daemon-1.12.1.tar.xz
 /mate-settings-daemon-1.14.0.tar.xz
+/mate-settings-daemon-1.14.1.tar.xz
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 83a13ee..371c67f 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -13,7 +13,7 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-settings-daemon
-Version:        %{branch}.0
+Version:        %{branch}.1
 %if 0%{?rel_build}
 Release:        1%{?dist}
 %else
@@ -146,7 +146,14 @@ fi
 
 
 %changelog
+<<<<<<< HEAD
 * Sun Jun 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
+=======
+* Fri Aug 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.1-1
+- update to 1.14.1 release
+
+* Wed Apr 06 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
+>>>>>>> f91719f... update to 1.14.1 release
 - update to 1.14.0 release
 
 * Fri Dec 04 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> 1.12.1-1
diff --git a/sources b/sources
index e02a640..46a1811 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1195bfb30c1468a9061f8e9aa07260e8  mate-settings-daemon-1.14.0.tar.xz
+7dcb88d2a6b15eebb2eb0f27769ec814  mate-settings-daemon-1.14.1.tar.xz