diff options
| author | Aaron Seigo <[email protected]> | 2011-12-21 17:08:23 +0100 |
|---|---|---|
| committer | Aaron Seigo <[email protected]> | 2011-12-21 17:08:23 +0100 |
| commit | 5e0e05e8f0c82e987cc56a17bdac1718e8feb320 (patch) | |
| tree | 7eccc6b7372ac6fe7d973e035abc31088d3f2fa4 /src/views | |
| parent | a8622c7a1ed9b04645eb5a4c72060ea5f08b5364 (diff) | |
| parent | 050e094e6b2ecd3c5ff4cc809d4ce3eedc61f3b8 (diff) | |
Merge remote branch 'origin/KDE/4.8'
Conflicts:
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/views')
0 files changed, 0 insertions, 0 deletions