]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Thu, 12 Jun 2014 06:51:50 +0000 (08:51 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Thu, 12 Jun 2014 06:51:50 +0000 (08:51 +0200)
commit6bccf73e9270e698e7ca23eb2dcaa05318e7b198
tree2239225d684d44fabfc03a6e20a548da5cd3ec01
parent05c8254ee47cb668771bb4009209122364e8a2a6
parent9dc1513f8bae968a363ea74af90a4042382d3d20
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/dolphincontextmenu.cpp
dolphin/src/panels/folders/treeviewcontextmenu.cpp
src/dolphincontextmenu.cpp
src/kitemviews/private/kfileitemclipboard.cpp
src/panels/folders/treeviewcontextmenu.cpp