]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge remote-tracking branch 'origin/KDE/4.11'
authorFrank Reininghaus <frank78ac@googlemail.com>
Sat, 26 Oct 2013 07:30:18 +0000 (09:30 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sat, 26 Oct 2013 07:30:18 +0000 (09:30 +0200)
1  2 
src/dolphinmainwindow.cpp
src/dolphinviewcontainer.cpp

Simple merge
Simple merge