Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCSprite.cpp tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp		2014-04-15 22:21:04 +08:00
..
cpp-empty-test	replace Point with Vector2 in tests, extension folder	2014-04-15 18:23:40 +08:00
cpp-tests	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-15 22:21:04 +08:00
lua-empty-test	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-27 11:21:20 +08:00
lua-tests	Small fix in Lua test.	2014-04-11 05:45:18 -07:00