James Chen 037c57ef96 Merge branch 'develop' into perf-callback ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj		2014-04-25 12:07:48 +08:00
..
cpp-tests.vcxproj	Merge branch 'develop' into perf-callback	2014-04-25 12:07:48 +08:00
cpp-tests.vcxproj.filters	Merge branch 'develop' into perf-callback	2014-04-25 12:07:48 +08:00
cpp-tests.vcxproj.user	rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.	2014-03-12 15:30:21 +08:00
main.cpp	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
main.h	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00