diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-08-31 17:09:29 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-08-31 17:09:29 +0200 |
| commit | 773028f270e4820776e1bedccb91a56cd5ec6078 (patch) | |
| tree | 418d0dc8532e7edcfa52846564f753e93f1ff8fe /src/panels | |
| parent | f27250bf27a30003a363f4af7adafef13d8abbb7 (diff) | |
| parent | dc378935d3f92c45a48349d08f96cac63411fd50 (diff) | |
Merge branch 'KDE/4.14'
Conflicts:
dolphin/src/dolphinmainwindow.cpp
Diffstat (limited to 'src/panels')
0 files changed, 0 insertions, 0 deletions