Merge branch 'KDE/4.10'

Browse Source

Conflicts:
	kcontrol/componentchooser/windowmanagers/compiz-custom.desktop

...

This commit is contained in:

Christophe Giboudeaux 2013-01-17 10:18:29 +01:00

parent 6d0ec6f376 cb15730316

commit 59b323de25

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