[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/berger-scripting] /: Merge branch 'master' into berger-scripting
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2016-08-20 9:41:07
Message-ID: E1bb2m3-00035n-FJ () code ! kde ! org
[Download RAW message or body]

Git commit 4e33c3693a817ce0913444f0c2129d8bbb69e1fe by Boudewijn Rempt.
Committed on 20/08/2016 at 09:40.
Pushed by rempt into branch 'berger-scripting'.

Merge branch 'master' into berger-scripting

M  +9    -4    3rdparty/CMakeLists.txt
M  +40   -31   krita/krita.xmlgui
M  +11   -0    libs/ui/CMakeLists.txt
M  +12   -5    libs/ui/KisMainWindow.cpp
M  +3    -0    libs/ui/KisViewManager.cpp
M  +4    -0    packaging/linux/snap/setup/gui/krita.desktop
M  +1    -0    plugins/extensions/CMakeLists.txt

http://commits.kde.org/krita/4e33c3693a817ce0913444f0c2129d8bbb69e1fe

diff --cc packaging/linux/snap/setup/gui/krita.desktop
index 6dc91c8,331f834..331f834
mode 100644,100755..100644
--- a/packaging/linux/snap/setup/gui/krita.desktop
+++ b/packaging/linux/snap/setup/gui/krita.desktop
[prev in list] [next in list] [prev in thread] [next in thread]