Merge branch 'KDE/4.10'

Browse source

Conflicts:
	solid/modemmanager-0.4/modemgsmnetworkinterface.cpp

...

This commit is contained in:

Dan Vrátil 2013-06-10 20:34:32 +02:00

parent 88be3d0caf 42719a96cc

commit 761df7a56f

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