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:
Brad King 2014-09-03 13:06:01 -04:00
commit d73f8828ca

Diff Content Not Available