]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa36c3f 90e2797)
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Sun, 1 Jun 2014 12:52:56 +0000 (14:52 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sun, 1 Jun 2014 12:52:56 +0000 (14:52 +0200)
Conflicts:
lib/konq/konq_operations.cpp

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

diff --cc src/kitemviews/kitemlistview.cpp
Simple merge
diff --cc src/kitemviews/kitemlistwidget.cpp
Simple merge