youyou 966100a511 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3		2014-11-24 10:35:51 +08:00
..
cpp-empty-test	sync with upstream	2014-11-20 12:19:00 +03:00
cpp-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-11-24 10:35:51 +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	sync with upstream	2014-11-20 12:19:00 +03: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	sync with upstream	2014-11-20 12:19:00 +03:00