diff options
| author | Emmanuel Pescosta <[email protected]> | 2015-01-28 17:13:59 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2015-01-28 17:13:59 +0100 |
| commit | a06ee3399bece608790e419054f95807a017a020 (patch) | |
| tree | 9caa2fd08b4c83e1ff2bad7cd51dfba6a60d2a7c /src/filterbar | |
| parent | 7745a9354776c6043b4f691260e434c29de6ca0c (diff) | |
| parent | cf6bb7bdb8df6f484a39403c7842343bceebf4b7 (diff) | |
Merge branch 'Applications/14.12' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
konqueror/settings/ebrowsing/ebrowsing.desktop
konqueror/settings/kio/cache.desktop
konqueror/settings/kio/cookies.desktop
konqueror/settings/kio/netpref.desktop
konqueror/settings/kio/proxy.desktop
konqueror/settings/kio/smb.desktop
konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop
konqueror/settings/kio/useragent.desktop
lib/konq/konq_operations.cpp
Diffstat (limited to 'src/filterbar')
0 files changed, 0 insertions, 0 deletions