diff options
| author | Frank Reininghaus <[email protected]> | 2013-01-27 15:25:47 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-01-27 15:25:47 +0100 |
| commit | 1bd91417dbb7752795ca763d221a7e39c99985aa (patch) | |
| tree | 67c691ccc1fc1d21c9bc75d006d8d91ef1e0ee6c /src/dolphindockwidget.cpp | |
| parent | f76f3a165419b048f9f8bcdfcb40042397b9af9b (diff) | |
| parent | 891ee0c41a3b2e80aa8191a6f8152c6095ce0351 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
dolphin/src/tests/kfileitemmodeltest.cpp
Diffstat (limited to 'src/dolphindockwidget.cpp')
0 files changed, 0 insertions, 0 deletions