Merge branch 'master' of gitlab.freemud.com:dingda.li/ClientFrame
# Conflicts: # ClientFrame/main.cpp
Test
analyze
Removing ClientFrame/Debug/
Removing ClientFrame/Release/
Removing Debug/
Removing LastCoverageResults.log
Removing Release/ClientFrame.exe
Removing Release/ClientFrame.pdb
Removing ipch/clientframe-76f33767/section_end:1556265915:get_sourcessection_start:1556265915:upload_artifacts_on_failuremesg: ttyname failed: Inappropriate ioctl for devicesection_end:1556265918:upload_artifacts_on_failureERROR: Job failed: exit status 1