Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h		2014-04-14 14:08:19 +08:00
..
cpp-empty-test	added wp8 support files and projects	2014-03-28 15:53:55 -07:00
cpp-tests	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-14 14:08:19 +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