Merge remote-tracking branch 'origin/Applications/14.12'

Browse source

Conflicts:
	VERSION
	core/version.h

...

This commit is contained in:

Albert Astals Cid 2015-02-27 01:22:41 +01:00

parent 5275d1271f 0c4ca94a0c

commit 49bc4c34cc

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