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

Browse source

Conflicts:
	CMakeLists.txt

...

This commit is contained in:

Albert Astals Cid 2013-05-30 21:04:08 +02:00

parent 020f6fd612 fb6d08435d

commit bbdbcdec23

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