]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8622c7 050e094)
Merge remote branch 'origin/KDE/4.8'
authorAaron Seigo <aseigo@kde.org>
Wed, 21 Dec 2011 16:08:23 +0000 (17:08 +0100)
committerAaron Seigo <aseigo@kde.org>
Wed, 21 Dec 2011 16:08:23 +0000 (17:08 +0100)
Conflicts:
plasma/applets/folderview/folderview.cpp


Trivial merge