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
..
xcshareddata/xcschemes	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
project.pbxproj	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7	2015-07-03 10:23:49 +08:00