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

Browse Source

Conflicts:
	VERSION
	core/version.h

remotes/origin/KDE/4.13

Albert Astals Cid 12 years ago

parent 8a8f7e891e 6c0299151f

commit 899a8e7dcd

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available