Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 ... # Conflicts: # external/config.json		2015-06-10 10:23:43 +08:00
..
cpp-empty-test	removed e option from xcopy of cpp template files	2015-06-05 09:21:52 -07:00
cpp-tests	Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2	2015-06-10 10:23:43 +08:00
game-controller-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
js-tests	Merge pull request #12204 from jianglong0156/issue1756	2015-06-05 13:17:53 +08:00
lua-empty-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
lua-game-controller-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
lua-tests	issue #12046: Add Lua bindings for material systems and related test cases.	2015-05-27 15:37:59 +08:00