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-template-default	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-15 22:21:04 +08:00
lua-template-default	Merge pull request #22 from cocos2d/develop	2014-04-11 09:33:04 +08:00
lua-template-runtime	replace Point with Vector2 in tests, extension folder	2014-04-15 18:23:40 +08:00
cocos2dx_files.json.REMOVED.git-id	[AUTO][ci skip]: updating cocos2dx_files.json	2014-04-10 08:40:58 +00:00