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

Browse source

Conflicts:
	VERSION
	core/version.h

...

This commit is contained in:

Albert Astals Cid 2014-07-30 19:33:44 +02:00

parent 896de56ef0 d30861fb1a

commit 91985ea1e4

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