James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-04-25 10:59:11 +08:00
..
cpp-tests.vcxproj	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012	2014-04-25 10:59:11 +08:00
cpp-tests.vcxproj.filters	Fix win32 build	2014-04-08 22:47:08 -07: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