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

Browse source

Conflicts:
	ktouchpadenabler/ktouchpadenabler.desktop

...

This commit is contained in:

Luca Beltrame 2013-02-25 16:47:13 +01:00

parent 2547192d95 4cb53c8471

commit 939fa12707

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