Merge remote-tracking branch 'origin/5.6.2' into 5.6

Browse Source

Conflicts:
	.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d

...

This commit is contained in:

Liang Qi

2016-09-30 14:36:23 +02:00

parent c9d71e9eeb c5557d43ee

commit 792f91dc87

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