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

Remove now unnecessary approachcircle proxy disables #2374

Merged
merged 5 commits into from Apr 20, 2018

Conversation

2 participants
@smoogipoo
Contributor

smoogipoo commented Apr 9, 2018

smoogipoo and others added some commits Apr 20, 2018

Merge remote-tracking branch 'origin/master' into remove-approachcirc…
…le-hax

# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@peppy

peppy approved these changes Apr 20, 2018

@peppy peppy merged commit 54ab001 into ppy:master Apr 20, 2018

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@smoogipoo smoogipoo deleted the smoogipoo:remove-approachcircle-hax branch Jun 15, 2018

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