Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs

Browse Source

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

parent cf92fe2d84 e7114226e6

commit d73f8828ca

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available