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

Browse source

In krunner/interfaces/default/interface.cpp kept the code from master as instructed by aseigo

Conflicts:
	CMakeLists.txt
	kcontrol/autostart/autostart.desktop
	kcontrol/screensaver/screensaver.desktop
	kwin/kwin.notifyrc
	powerdevil/powerdevil.notifyrc
	solid/solid-actions-kcm/device-actions/solid-device-AcAdapter.desktop
	solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop
	solid/solid-actions-kcm/solid-actions.desktop

...

This commit is contained in:

Albert Astals Cid 2012-11-30 22:09:10 +01:00

parent 5fc8da9ad7 92a45bc7b9

commit 79043da553

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

Diff content is not available