pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 ... Conflicts: cocos/ui/UICheckBox.cpp		2015-07-03 10:23:49 +08:00
..
cpp-template-default	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
js-template-default	Fix video player and web view in js template	2015-07-02 11:48:13 +08:00
js-template-runtime	Solve the error config of js runtime template.	2015-06-30 16:03:39 +08:00
lua-template-default	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
lua-template-runtime	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
cocos2dx_files.json	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7	2015-07-03 10:23:49 +08:00