]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge remote-tracking branch 'origin/KDE/4.9'
authorFrank Reininghaus <frank78ac@googlemail.com>
Fri, 7 Dec 2012 21:31:24 +0000 (22:31 +0100)
committerFrank Reininghaus <frank78ac@googlemail.com>
Fri, 7 Dec 2012 21:31:24 +0000 (22:31 +0100)
1  2 
src/kitemviews/kstandarditemlistwidget.cpp
src/main.cpp
src/views/dolphinview.cpp

diff --cc src/main.cpp
Simple merge
Simple merge