aboutsummaryrefslogtreecommitdiff
path: root/build_msvc/common.vcxproj
diff options
context:
space:
mode:
authorChun Kuan Lee <ken2812221@gmail.com>2019-02-14 20:08:15 +0800
committerChun Kuan Lee <ken2812221@gmail.com>2019-02-14 20:08:15 +0800
commit3c6ef0393ff72a6105e3e40e2db8b355945584ab (patch)
tree1328d613bc18ac0cb736a93915b59f2e811ade16 /build_msvc/common.vcxproj
parent6f4e0d154256c2041f15f0c4acba5707e985d649 (diff)
msvc: Fix silent merge conflict between #13926 and #14372 part II
Diffstat (limited to 'build_msvc/common.vcxproj')
0 files changed, 0 insertions, 0 deletions