]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Sun, 29 Jun 2014 18:26:17 +0000 (20:26 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sun, 29 Jun 2014 18:28:46 +0000 (20:28 +0200)
commit81b84a1eaf9fcfc3c2318b7ab4d30c7c578e9680
treecac867ccfa59547b10ce37b14a363403fb6ee81c
parent81d5335060dd640298c62e7fc4fd6a32a34c3e9d
parent74d8522ac63199b702a09610ca7b1a7071a7215b
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinmainwindow.h
src/CMakeLists.txt
src/dolphinmainwindow.cpp
src/dolphinmainwindow.h
src/dolphinrecenttabsmenu.cpp
src/kitemviews/kfileitemmodel.cpp