From kde-commits  Thu Jan 14 19:44:50 2016
From: Frank Reininghaus <frank78ac () googlemail ! com>
Date: Thu, 14 Jan 2016 19:44:50 +0000
To: kde-commits
Subject: [dolphin] src: Merge branch 'Applications/15.12'
Message-Id: <E1aJnpC-0007KA-UJ () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145280070128252

Git commit 0743843ebb8f5dc967a1434b8f7676f8e1b9488c by Frank Reininghaus.
Committed on 14/01/2016 at 19:41.
Pushed by freininghaus into branch 'master'.

Merge branch 'Applications/15.12'

M  +4    -0    src/dolphinpart.desktop
M  +2    -0    src/org.kde.dolphin.desktop
M  +5    -0    src/settings/kcm/kcmdolphinnavigation.desktop
M  +4    -0    src/settings/kcm/kcmdolphinservices.desktop
M  +5    -0    src/settings/kcm/kcmdolphinviewmodes.desktop
M  +1    -0    src/views/versioncontrol/fileviewversioncontrolplugin.desktop

http://commits.kde.org/dolphin/0743843ebb8f5dc967a1434b8f7676f8e1b9488c