diff options
| author | Luca Beltrame <[email protected]> | 2012-09-21 10:55:08 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2012-09-21 10:55:08 +0200 |
| commit | f1b822d926316d739ec10d8b05917b6b0c2d92b5 (patch) | |
| tree | 20e52bfd70694a34f86fa650d3797be67bda8f67 /src/tests | |
| parent | 399c4b22ea9947047c7d2777d7f361df6b5e9636 (diff) | |
| parent | c8243401470156d9ee76e2015a23741570d3dba1 (diff) | |
Merge branch 'KDE/4.9'
Conflicts:
konq-plugins/dirfilter/dirfilterplugin.cpp
konq-plugins/dirfilter/dirfilterplugin.h
Diffstat (limited to 'src/tests')
0 files changed, 0 insertions, 0 deletions