James Chen 037c57ef96 Merge branch 'develop' into perf-callback ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj		2014-04-25 12:07:48 +08:00
..
TestCpp	Adds performance test for callbacks: 1) std::function,	2014-04-16 10:35:58 +08:00
cpp-tests	added wp8 support files and projects	2014-03-28 15:54:36 -07:00
cpp-testsComponent	Merge branch 'develop' into perf-callback	2014-04-25 12:07:48 +08:00
TestCpp.sln	added wp8 support files and projects	2014-03-28 15:54:36 -07:00