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
..
Classes	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +08:00
Resources	fixed retro pos.	2015-08-12 15:09:33 +08:00
proj.android	Fixed #12962 : Scene can't have std::vector member.	2015-07-24 11:16:45 +08:00
proj.android-studio	[Android Studio Projects]Update Gradle from 2.2.1 to 2.4	2015-07-31 21:20:42 +08:00
proj.ios	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +08:00
proj.linux	…
proj.mac	precompiled headers improvements for iOS & Mac	2014-09-23 23:19:25 +04:00
proj.win8.1-universal	Fixed #12962 : Scene can't have std::vector member.	2015-07-24 11:16:45 +08:00
proj.win10	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00
proj.win32	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
CMakeLists.txt	add sprite frame flash line bug test case.	2015-07-22 13:42:10 +08:00