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
..
Classes	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests	2012-11-21 15:27:47 +08:00
Resources	issue #1564:update LabelTest	2012-11-20 18:17:47 +08:00
proj.android	issue #1564: Return a new object instead of 'const reference' for some get methods.	2012-11-20 16:34:55 +08:00
proj.blackberry	Resource file searching implementation for blackberry.	2012-08-27 13:48:17 +08:00
proj.ios	issue #1564:add ChipmunkTest	2012-11-21 12:02:29 +08:00
proj.linux	fix compiling error on linux 64 bit	2012-11-01 15:38:48 +08:00
proj.mac	issue #1564: update some test cases	2012-11-20 17:30:05 +08:00
proj.marmalade	The S3E data dir ONLY used by the emulator/simulator.	2012-11-17 13:49:01 +01:00
proj.win32	issue #1564: Added ClippingNodeTest.	2012-11-21 15:22:54 +08:00
Android.mk	issue #1564: Added ClippingNodeTest.	2012-11-21 15:22:54 +08:00