]> cloud.milkyroute.net Git - dolphin.git/commit
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Fri, 22 Aug 2014 21:17:02 +0000 (23:17 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Fri, 22 Aug 2014 21:17:02 +0000 (23:17 +0200)
commitd4fb129710d7fadf8e21f2cfd2588a794f774e41
tree03f73790c290013aa7026ebea723e7e18741c999
parentee946d362c64ee35af932b3cad54d23ad786fe55
parent7b0c9bbc58fc543a116104155fc8f3d81113d3a8
Merge branch 'master' into frameworks

Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinmainwindow.h
dolphin/src/dolphinrecenttabsmenu.cpp
dolphin/src/dolphinviewcontainer.cpp
kfind/CMakeLists.txt
src/CMakeLists.txt
src/dolphinmainwindow.cpp
src/dolphinmainwindow.h
src/dolphinrecenttabsmenu.cpp
src/dolphintabwidget.cpp
src/dolphinviewcontainer.cpp
src/kitemviews/kstandarditemlistwidget.cpp
src/statusbar/dolphinstatusbar.cpp
src/views/dolphinview.cpp