]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e4991d c2108b1)
Merge remote-tracking branch 'origin/KDE/4.12'
authorFrank Reininghaus <frank78ac@googlemail.com>
Sun, 22 Dec 2013 12:20:02 +0000 (13:20 +0100)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sun, 22 Dec 2013 12:20:02 +0000 (13:20 +0100)
1  2 
src/kitemviews/kfileitemmodel.cpp patch | diff1 | diff2 | blob | history

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