Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

out-comment s_tick #709

Merged
merged 2 commits into from
Jan 8, 2013
Merged

out-comment s_tick #709

merged 2 commits into from
Jan 8, 2013

Conversation

2mc
Copy link
Contributor

@2mc 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.

@timblechmann
Copy link
Contributor

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?

@2mc
Copy link
Contributor Author

2mc commented Jan 8, 2013

done -- with pleasure ;-)

@timblechmann
Copy link
Contributor

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 added a commit that referenced this pull request 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.
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants