andyque 82f597ce98 Merge branch 'v3.7.1' into v3 ... # Conflicts: # cocos/scripting/lua-bindings/auto/api/CheckBox.lua # cocos/ui/UICheckBox.cpp # cocos/ui/UICheckBox.h		2015-08-12 17:59:50 +08:00
..
parsers	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +08:00
jsb_cocos2d_studio.js	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
jsb_studio_boot.js	Fix JS binding issues for skeleton animation	2015-07-24 20:16:01 +08:00
jsb_studio_create_apis.js	Merge pull request #12998 from pandamicro/v3.7.1	2015-07-24 23:42:38 +08:00
jsb_studio_load.js	Fixed a bug that action texture address error	2015-07-06 17:17:20 +08:00
jsb_studio_property_apis.js	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00