]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d75c7a e2a89fc)
Merge remote-tracking branch 'origin/KDE/4.10'
authorAurélien Gâteau <agateau@kde.org>
Thu, 21 Mar 2013 13:12:28 +0000 (14:12 +0100)
committerAurélien Gâteau <agateau@kde.org>
Thu, 21 Mar 2013 13:14:55 +0000 (14:14 +0100)
@emmanuel: this merge includes your fix from
https://git.reviewboard.kde.org/r/109488/ . I assume this is not a
problem.

CCMAIL: emmanuelpescosta099@gmail.com

1  2 
src/kitemviews/kfileitemmodel.cpp patch | diff1 | diff2 | blob | history

diff --cc src/kitemviews/kfileitemmodel.cpp
Simple merge