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

Browse source

Conflicts:
	CMakeLists.txt

...

This commit is contained in:

Albert Astals Cid 2013-01-29 00:00:04 +00:00

parent f3ca3e4c02 862b35dcc8

commit 905558fea1

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