diff options
| author | Luca Beltrame <[email protected]> | 2012-11-20 07:44:59 +0100 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2012-11-20 07:44:59 +0100 |
| commit | 59e8f22cd5de7cc1811550d8bac6aacc5c36587c (patch) | |
| tree | a553d6722ccffc119d7d7e43a49d0a5f1297c4ec /src/settings/additionalinfodialog.cpp | |
| parent | c73bf691c6f93e4df5401cceeb536e831442c3c0 (diff) | |
| parent | 96672c166f2acfe56b5a2779562082a0e9fab825 (diff) | |
Merge branch 'KDE/4.9'
Conflicts:
konqueror/settings/kio/kcookiespolicies.cpp [master only changes]
konqueror/settings/kio/kcookiespolicies.h [ditto]
Diffstat (limited to 'src/settings/additionalinfodialog.cpp')
0 files changed, 0 insertions, 0 deletions