diff options
| author | Frank Reininghaus <[email protected]> | 2013-03-10 18:31:23 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-03-10 18:31:23 +0100 |
| commit | f71e0881d2c0a52c5fa020e3fd2b44ca6ab7b2d4 (patch) | |
| tree | e711afe6b0e40c3efec8ff920af009c7c4e2155c /src/views | |
| parent | be8443bed87c1f27a9cd1f82d969cc06f91c2f62 (diff) | |
| parent | 9dd728cb98e0ea822248c641aef5d66f2476768e (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
dolphin/src/kitemviews/kfileitemmodel.cpp
Diffstat (limited to 'src/views')
0 files changed, 0 insertions, 0 deletions