diff options
| author | Frank Reininghaus <[email protected]> | 2014-06-12 08:51:50 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-06-12 08:51:50 +0200 |
| commit | 6bccf73e9270e698e7ca23eb2dcaa05318e7b198 (patch) | |
| tree | 2239225d684d44fabfc03a6e20a548da5cd3ec01 /src/dolphinnewfilemenu.cpp | |
| parent | 05c8254ee47cb668771bb4009209122364e8a2a6 (diff) | |
| parent | 9dc1513f8bae968a363ea74af90a4042382d3d20 (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/dolphincontextmenu.cpp
dolphin/src/panels/folders/treeviewcontextmenu.cpp
Diffstat (limited to 'src/dolphinnewfilemenu.cpp')
0 files changed, 0 insertions, 0 deletions
