Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

Browse source

Conflicts:
	VERSION
	core/version.h

...

This commit is contained in:

Albert Astals Cid 2013-11-23 17:55:00 +01:00

parent db53b2f359 7881731a2b

commit ec814654bc

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