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

Browse source

Conflicts:
	CMakeLists.txt
	plasma/generic/applets/batterymonitor/metadata.desktop

...

This commit is contained in:

Jekyll Wu 2012-11-10 14:05:20 +08:00

parent f4cdf47c93 bd7d7e7b01

commit 6979e0a9eb

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