Skip to content

Merge latest google/develop Blockly #111

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

Merged
merged 30 commits into from
Mar 3, 2016
Merged

Merge latest google/develop Blockly #111

merged 30 commits into from
Mar 3, 2016

Conversation

tmickel
Copy link
Contributor

@tmickel tmickel commented Mar 3, 2016

Fixes #82 and #64.

NeilFraser and others added 30 commits February 16, 2016 22:17
…tor_continue

Add tests for connection logic
calls come before all of the setAttribute calls.  This gets rid
of an unnecessary layout pass on mouseMove events.
Rearrange code in ScrollbarPair set so that all the getAttribute
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	core/connection.js
#	tests/jsunit/index.html
#	tests/playground.html
@tmickel tmickel added this to the March 31 milestone Mar 3, 2016
tmickel added a commit that referenced this pull request Mar 3, 2016
Merge latest google/develop Blockly
@tmickel tmickel merged commit a8b38fc into scratchfoundation:develop Mar 3, 2016
@tmickel tmickel deleted the feature/upstream-merge branch March 3, 2016 21:33
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.

6 participants