Ray Schamp 1a6dff7f42 Merge branch 'master' of github.com:google/blockly into merge/google-2016 ... # Conflicts: # blockly_compressed_vertical.js # blockly_uncompressed_vertical.js # blocks/text.js # blocks_compressed.js # core/block_svg.js # core/connection.js # core/field_textinput.js # core/flyout.js # core/toolbox.js # tests/playground.html		2016-02-18 13:29:25 -05:00
..
colour.js	Trivial number/text/colour blocks should inherit parent's tooltip.	2016-02-02 16:20:02 -08:00
lists.js	Add workspace.newBlock, deprecate Blockly.Block.obtain.	2015-12-07 16:40:45 +01:00
logic.js	changing the controls_if_if block to allow controls_if_elseif and controls_if_else blocks to attach to the bottom of the if block instead of in the middle of the block.	2015-12-17 15:29:50 -08:00
loops.js	Rename Field.setChangeHandler to Field.setValidator	2016-02-10 14:33:13 -08:00
math.js	Trivial number/text/colour blocks should inherit parent's tooltip.	2016-02-02 16:20:02 -08:00
procedures.js	Make colour optional in JSON. Add ;/n in generator stub.	2016-01-28 14:25:38 -05:00
text.js	Merge branch 'master' of github.com:google/blockly into merge/google-2016	2016-02-18 13:29:25 -05:00
variables.js	Allow multiple interpolation messages. Fix variable context menus.	2015-06-27 12:49:01 -07:00