diff options
| author | Luca Beltrame <[email protected]> | 2013-03-27 16:50:22 +0100 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2013-03-27 16:50:22 +0100 |
| commit | 8cc479518be479365d91e5139f064fcce970d0a3 (patch) | |
| tree | 5b7fbc8843a2eddbefc61d0cfee075617cf0ba4b /src/views/dolphinview.cpp | |
| parent | 6dfcd7afd9336ee73d78f703e208088aa3f5ca60 (diff) | |
| parent | df8d439c55ea62eeb109bf5ff8f55ae3f386dd70 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/views/dolphinview.cpp')
0 files changed, 0 insertions, 0 deletions