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

Browse source

Conflicts:
	plasma/generic/applets/lock_logout/metadata.desktop [scripty]

...

This commit is contained in:

Luca Beltrame 2013-04-08 20:26:05 +02:00

parent 8116322f93 8381581c5a

commit cfd36fb32e

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