WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon ... # Conflicts: # external/config.json		2015-06-16 11:19:20 +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' into fix_spritepolygon	2015-06-16 11:19:20 +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 branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon	2015-06-16 00:56:58 +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	Update the Lua binding about the Polygon and update the test case.	2015-06-11 14:38:38 +08:00