James Chen dd2b15cba0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests ... Conflicts: samples/TestCpp/Classes/tests.h		2012-11-21 15:27:47 +08:00
..
HelloCpp	issue #1565: Removed VS2008 support.	2012-11-19 14:42:27 +08:00
HelloLua	issue #1565: Removed VS2008 support.	2012-11-19 14:42:27 +08:00
MoonWarriors	issue #1565: Removed VS2008 support.	2012-11-19 14:42:27 +08:00
SimpleGame	The S3E data dir ONLY used by the emulator/simulator.	2012-11-17 13:49:01 +01:00
TestCpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests	2012-11-21 15:27:47 +08:00
TestJavascript	issue #1565: Removed VS2008 support.	2012-11-19 14:42:27 +08:00
TestLua	Merge pull request #1592 from fape/luaCocos2d	2012-11-19 17:36:25 -08:00