Merge branch 'master' into 1.4

Browse Source

Conflicts:
	common.pri

...

This commit is contained in:

Arin Alex

2016-12-07 20:41:04 +03:00

parent 114e690541 a73bc90417

commit 00b30be295

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available