From 04b2227a8db58428139490b27e6e61e9ee3da027 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 2 Dec 2016 05:50:32 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- kdecoration/breeze.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json index 4efcd5ef..8045b632 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -57,4 +57,4 @@ "blur": false, "kcmodule": true } -} \ No newline at end of file +} From f67714e3c381c758e9dfcc0df8ea6a2f9b4d63de Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 27 Dec 2016 09:21:22 +0000 Subject: [PATCH 2/2] Update version number for 5.8.5 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5bd2266..23b2a768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.8.4") +set(PROJECT_VERSION "5.8.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)