Merge remote-tracking branch 'remotes/github/pullrequests' into pullrequests
commitf011bd0a8a1c9af47f1b92356e9c44c91b575c47
authorCry-Build <Cry-Build@users.noreply.github.com>
Tue, 28 Feb 2017 00:16:54 +0000 (28 01:16 +0100)
committerCry-Build <Cry-Build@users.noreply.github.com>
Tue, 28 Feb 2017 00:16:54 +0000 (28 01:16 +0100)
tree98bbd1656f8abc4a4189c650c9d306829d57adab
parent35766c589e82292710e36e99d4c085500ea6ec32
Merge remote-tracking branch 'remotes/github/pullrequests' into pullrequests

Copied from Perforce
 Change: 1492824
CMakeSettings.json