From kde-commits  Tue Feb 10 16:47:42 2015
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Tue, 10 Feb 2015 16:47:42 +0000
To: kde-commits
Subject: [breeze] kstyle: Merge branch 'Plasma/5.2'
Message-Id: <E1YLDyQ-0006Kz-Vb () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142358687208197

Git commit dc892900e3d03705c0ded4c22bdb5f915ae02162 by David Edmundson.
Committed on 10/02/2015 at 16:47.
Pushed by davidedmundson into branch 'master'.

Merge branch 'Plasma/5.2'

Conflicts:
	cursors/Breeze_Snow/Breeze_Snow/index.theme
	cursors/Breeze_Snow/src/index.theme
	icons/index.theme

M  +1    -1    kstyle/breezepalettehelper.cpp
M  +1    -1    kstyle/breezestyle.cpp

http://commits.kde.org/breeze/dc892900e3d03705c0ded4c22bdb5f915ae02162