Merge remote-tracking branch 'origin/KDE/4.10'

Browse source

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

...

This commit is contained in:

Albert Astals Cid 2013-03-15 21:55:53 +01:00

parent d19745cd6a ae044f0ee1

commit 72be4e2f45

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

konqueror/pics/indicators/indicator_empty.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 409 B After Width:  |  Height:  |  Size: 428 B

BIN

konqueror/pics/indicators/indicator_viewactive.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 643 B After Width:  |  Height:  |  Size: 643 B