Merge branch 'KDE/4.7' into KDE/4.8

Browse Source

Conflicts:
	plasma/data/services/plasma.protocol

...

This commit is contained in:

Ralf Habacker 2011-12-30 23:35:31 +01:00

parent 7126ebd18a 4a75f4a69b

commit 78b79686f8

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 Not Available