diff options
| author | Albert Astals Cid <[email protected]> | 2013-03-15 21:55:53 +0100 |
|---|---|---|
| committer | Albert Astals Cid <[email protected]> | 2013-03-15 21:55:53 +0100 |
| commit | 9d73c1ad7f123dfebbd1f0fade8cf8a2e3cac444 (patch) | |
| tree | d5fe9809f4119121f04c950fe8cff0c9b0e81c2b /src/panels/information | |
| parent | 382834e0fbe845a0b66a37d0053168e9358a6a34 (diff) | |
| parent | 34f1ffd668bcf75ee363da8bacc08e6587371a0a (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
dolphin/src/dolphin.desktop
konq-plugins/searchbar/searchbar.desktop
konqueror/settings/kio/proxy.desktop
konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop
konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
konqueror/settings/kio/uasproviders/googlebot.desktop
konqueror/settings/kio/uasproviders/ie60oncurrent.desktop
konqueror/settings/kio/uasproviders/op90oncurrent.desktop
konqueror/settings/kio/uasproviders/safari20.desktop
konqueror/sidebar/default_entries/history.desktop
konqueror/sidebar/default_entries/root.desktop
konqueror/sidebar/history_module/kcmhistory.desktop
Diffstat (limited to 'src/panels/information')
0 files changed, 0 insertions, 0 deletions