Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj		2014-04-11 11:18:13 +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-11 11:18:13 +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	fix the crash invoked by deprecated `create` function of `Label`	2014-04-10 23:36:25 +08:00