diff options
| author | Christophe Giboudeaux <[email protected]> | 2013-01-07 18:22:28 +0100 |
|---|---|---|
| committer | Christophe Giboudeaux <[email protected]> | 2013-01-07 18:22:28 +0100 |
| commit | feae9f9dfc9e1a04135ddc7efa16eb1294be4850 (patch) | |
| tree | dbd3d5dc909d77fb6b68a1352623f0b9afa3faca /src/dolphincontextmenu.cpp | |
| parent | 2e88d73423fd88f676620d714ce159587656e6ca (diff) | |
| parent | 6b351820a3405a1ce60916132a277435efabd685 (diff) | |
Merge branch 'KDE/4.10'
Conflicts:
dolphin/src/CMakeLists.txt
Diffstat (limited to 'src/dolphincontextmenu.cpp')
0 files changed, 0 insertions, 0 deletions