zhangbin 3715aeb0f6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2014-11-19 10:00:51 +08:00
..
cpp-empty-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2014-11-19 10:00:51 +08:00
cpp-tests	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00
game-controller-test	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
lua-empty-test	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00
lua-game-controller-test	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
lua-tests	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00