]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dfcd7a df8d439)
Merge remote-tracking branch 'origin/KDE/4.10'
authorLuca Beltrame <luca.beltrame@marionegri.it>
Wed, 27 Mar 2013 15:50:22 +0000 (16:50 +0100)
committerLuca Beltrame <luca.beltrame@marionegri.it>
Wed, 27 Mar 2013 15:50:22 +0000 (16:50 +0100)
Conflicts:
plasma/applets/folderview/folderview.cpp

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

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