Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs
Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our side.
This commit is contained in:
commit
d73f8828ca
Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our side.