diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-08-14 18:28:51 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-08-14 18:28:51 +0200 |
| commit | 4b758c386fb3957160af334230bacd96ed810d2c (patch) | |
| tree | 97afbcc16d11b23d5a552f2f7fffa17817616852 /src/dolphintabpage.cpp | |
| parent | cdebd199251bbdf2826bcc65fe0483420d4a6784 (diff) | |
| parent | b73aeb4598503ee7b4eb11f38edd26783d20bbb6 (diff) | |
Merge branch 'KDE/4.14'
Conflicts:
dolphin/src/dolphin.appdata.xml
Diffstat (limited to 'src/dolphintabpage.cpp')
0 files changed, 0 insertions, 0 deletions