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

Revert #1260, #1258, #1239 #1262

Merged
merged 1 commit into from
Jun 22, 2018
Merged

Conversation

rschamp
Copy link
Contributor

@rschamp rschamp commented Jun 22, 2018

Due to scratchfoundation/scratch-gui#2433 failing, we want to pull out the changes to the VM so future updates to develop can continue to be pulled in and deployed to GUI.

This reverts commits
c268bba
61dacfc
30b8cb8

/cc @ericrosenbaum @gnarf @mzgoddard

@rschamp rschamp added this to the June 2018 milestone Jun 22, 2018
@rschamp rschamp self-assigned this Jun 22, 2018
@gnarf
Copy link
Contributor

gnarf commented Jun 22, 2018

Can we keep this on a branch so we can fix it? I'm not sure how this broke, but am looking into it

@rschamp
Copy link
Contributor Author

rschamp commented Jun 22, 2018

@gnarf Yes! I just pushed up the revert to this revert for the fix to go on: https://github.com/LLK/scratch-vm/tree/unrevert-audio

@rschamp rschamp merged commit b5b2461 into scratchfoundation:develop Jun 22, 2018
@rschamp rschamp deleted the revert-audio branch June 22, 2018 13:45
@gnarf gnarf mentioned this pull request Jun 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants