James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade ... Conflicts: cocos2dx/base_nodes/CCNode.cpp cocos2dx/sprite_nodes/CCSprite.cpp samples/TestCpp/Classes/TouchesTest/Ball.cpp samples/TestCpp/Classes/VisibleRect.cpp samples/TestCpp/Classes/VisibleRect.h		2012-11-12 10:20:04 +08:00
..
android/prebuilt	issue #1312: use --strip-unneeded parameter to strip lib	2012-10-25 16:30:14 +08:00
blackberry	Cocos2dx for gles2.	2012-08-17 17:45:21 -04:00
ios	fixed #1548: Updated libcurl header files to 7.26.0 on iOS.	2012-11-05 13:13:46 +08:00
linux	fix compiling error on linux 64 bit	2012-11-01 15:38:48 +08:00
marmalade	Marmalade Support	2012-10-19 16:26:34 +01:00
win32	issue #1312: Upgraded libcurl to 7.26.0 for windows port.	2012-10-29 10:49:28 +08:00