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

Browse source

Conflicts:
	khotkeys/data/kde32b1.khotkeys [differences in translations]

...

This commit is contained in:

Luca Beltrame 2013-02-09 17:24:34 +01:00

parent c14c152cb5 084df811d2

commit 899fc4a5c8

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