out-comment s_tick #709

Merged
merged 2 commits into from Jan 8, 2013

Conversation

Projects
None yet
2 participants
Contributor

2mc commented Jan 8, 2013

Merge pull request #703 broke 'no-ide compiles' due to the duplicate symbol 's_tick' introduced by commit 8807e9e. I guess, occurrence of 's_tick' in 'GUIPrimitives.m' is a left-over and should be removed there.

Contributor

timblechmann commented Jan 8, 2013

thanks. however it should not be commented out, but removed: simply commenting out code just makes the code harder to read. could you do that and update the pull request?

Contributor

2mc commented Jan 8, 2013

done -- with pleasure ;-)

Contributor

timblechmann commented Jan 8, 2013

ok. for the future: the comment from the pull request should go into the commit message ... makes the history easier to read and understand ...

@timblechmann timblechmann added a commit that referenced this pull request Jan 8, 2013

@timblechmann timblechmann Merge pull request #709 from 2mc/masters_tick
Merge pull request #703 broke 'no-ide compiles' due to the duplicate symbol 's_tick' introduced by commit 8807e9e. I guess, occurrence of 's_tick' in 'GUIPrimitives.m' is a left-over and should be removed there.
15a1f19

@timblechmann timblechmann merged commit 15a1f19 into supercollider:master Jan 8, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment