samuele3hu 01e44c440c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine		2014-10-22 17:07:18 +08:00
..
cpp-empty-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
cpp-tests	Merge pull request #8893 from dabingnn/v3_fixTypo	2014-10-22 14:16:07 +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	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-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	Fix some lua-tests error	2014-10-22 17:04:18 +08:00