diff options
| author | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
| commit | 01e4f60a0931aba506b184d384a4e2f926b2233c (patch) | |
| tree | 902da94d4ed035af9da2aea537708cdc2ea14d9c /src/tests/kfileitemmodelbenchmark.cpp | |
| parent | cd601a582d5454dfa1818bae7e50864e9bece575 (diff) | |
| parent | a75e81ca01ea61c615582e93ceed69398967831e (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/tests/kfileitemmodelbenchmark.cpp')
0 files changed, 0 insertions, 0 deletions