]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edcc9d5 7ffa66f)
Merge remote-tracking branch 'origin/KDE/4.11'
authorFrank Reininghaus <frank78ac@googlemail.com>
Sat, 24 Aug 2013 18:27:30 +0000 (20:27 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sat, 24 Aug 2013 18:27:30 +0000 (20:27 +0200)
1  2 
src/kitemviews/kfileitemmodel.cpp patch | diff1 | diff2 | blob | history

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