samuele3hu 7198ae509c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-10-16 20:35:43 +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 #8758 from dabingnn/v3_fixVBOFullTest	2014-10-16 19:36:01 +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	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine	2014-10-16 20:35:43 +08:00