diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-08-22 23:17:02 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-08-22 23:17:02 +0200 |
| commit | d4fb129710d7fadf8e21f2cfd2588a794f774e41 (patch) | |
| tree | 03f73790c290013aa7026ebea723e7e18741c999 /src/dolphindockwidget.h | |
| parent | ee946d362c64ee35af932b3cad54d23ad786fe55 (diff) | |
| parent | 7b0c9bbc58fc543a116104155fc8f3d81113d3a8 (diff) | |
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
Diffstat (limited to 'src/dolphindockwidget.h')
0 files changed, 0 insertions, 0 deletions