WuHao 3d62805d04 Merge branch 'v3' into fix_spritepolygon ... # Conflicts: # build/cocos2d_libs.xcodeproj/project.pbxproj # cocos/2d/MarchingSquare.cpp		2015-05-29 18:10:41 +08:00
..
cpp-empty-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
cpp-tests	Merge branch 'v3' into fix_spritepolygon	2015-05-29 18:10:41 +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 #12091 from joshuastray/properties	2015-05-29 14:22:36 +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