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

Add new sound blocks #763

Merged
merged 27 commits into from Jan 6, 2017
Merged

Conversation

ericrosenbaum
Copy link
Contributor

No description provided.

…ocks into develop

# Conflicts:
#	blockly_compressed_horizontal.js
#	blockly_compressed_vertical.js
#	blockly_uncompressed_horizontal.js
#	blockly_uncompressed_vertical.js
#	blocks_compressed.js
#	blocks_compressed_horizontal.js
#	blocks_compressed_vertical.js
#	blocks_vertical/sound.js
…ocks into sound

# Conflicts:
#	blocks_vertical/default_toolbox.js
#	blocks_vertical/sound.js
@ericrosenbaum ericrosenbaum added this to the January 19 milestone Jan 6, 2017
@ericrosenbaum ericrosenbaum self-assigned this Jan 6, 2017
Copy link
Contributor

@rschamp rschamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dino_optimized

@rschamp rschamp removed their assignment Jan 6, 2017
@ericrosenbaum ericrosenbaum merged commit 6e6fb61 into scratchfoundation:develop Jan 6, 2017
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.

None yet

2 participants