From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 23 Apr 2013 17:40:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7f381a34cb37ff4aeb215a8fe91448e5ea27aca0

Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
	plasma/applets/folderview/folderview.cpp

CCMAIL: ignat.semenov@blue-systems.com

@Ignat: We've been following a merge-based approach in kde-baseapps
for quite some time now, see

http://lists.kde.org/?t=134744909400005&r=1&w=1

It would be nice if you could merge KDE/4.10 into master after any
non-trivial changes in folderview to prevent that others have to
figure out how to resolve the merge conflicts. Thanks!
---

7f381a34cb37ff4aeb215a8fe91448e5ea27aca0