]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12
authorFrank Reininghaus <frank78ac@googlemail.com>
Thu, 5 Dec 2013 23:56:34 +0000 (00:56 +0100)
committerFrank Reininghaus <frank78ac@googlemail.com>
Thu, 5 Dec 2013 23:56:34 +0000 (00:56 +0100)
1  2 
src/views/dolphinview.cpp

Simple merge