samuele3hu 30f375ef07 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine		2014-10-17 17:37: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 #8788 from samuele3hu/v3_new_spine	2014-10-17 16: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	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	Update Mac project setting and some lua test cases about UI and ActionTimeline	2014-10-17 17:35:50 +08:00