diff options
| author | Christophe Giboudeaux <[email protected]> | 2013-01-02 15:28:43 +0100 |
|---|---|---|
| committer | Christophe Giboudeaux <[email protected]> | 2013-01-02 15:28:43 +0100 |
| commit | 56f1c0371c4e5d9f874dede5e4773165f88cbbb6 (patch) | |
| tree | 35f7130e0f6e0610017658643571f4229fedce55 /src/dolphindockwidget.cpp | |
| parent | ed4644bd875bce2bb797a96652b4aced9eb75976 (diff) | |
| parent | bf202f3931c804af1c03bd958a8e946bab8b4b52 (diff) | |
Merge branch 'KDE/4.10'
Conflicts:
dolphin/src/CMakeLists.txt
Diffstat (limited to 'src/dolphindockwidget.cpp')
0 files changed, 0 insertions, 0 deletions