Homec4science

Merge branch 'fix-1022'

Authored by Carl Suster <carl@contraflo.ws> on Apr 6 2014, 02:38.

Description

Merge branch 'fix-1022'

Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.

Event Timeline

Carl Suster <carl@contraflo.ws> committed rGITIGNOREb3d27fcf04fa: Merge branch 'fix-1022' (authored by Carl Suster <carl@contraflo.ws>).Apr 6 2014, 02:38

Merged Changes

CommitAuthorDetailsCommitted
5f4223833162Carl Suster
Remove Obj-C-specific hmap & ipa from general Xcode template 
Apr 6 2014
336dd397ffc2Carl Suster
Remove profile from Obj-C to match #956 
Apr 6 2014
9707fd125c5eKonstantin Koval
put back Xcode ignore to Objective-C. 
Mar 31 2014