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

Browse source

Conflicts:
	solid/modemmanager-0.4/solid_modemmanager04.desktop [deleted]
	solid/networkmanager-0.7/solid_networkmanager07.desktop [deleted]

...

This commit is contained in:

David Faure 2013-04-23 10:50:37 +02:00

parent 71d0e363d3 88f3f67cbe

commit 2b3cf17649

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