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
..
HelloCpp	Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade	2012-11-12 10:20:04 +08:00
HelloLua	Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade	2012-11-12 10:20:04 +08:00
MoonWarriors	issue #1549: Using new JS API for MoonWarriors.	2012-11-05 23:22:59 +08:00
SimpleGame	Marmalade Sample data removed and merged changes	2012-10-25 21:40:37 +01:00
TestCpp	Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade	2012-11-12 10:20:04 +08:00
TestJavascript	Redirected cocos2d-html5-tests to cocos2d-js-tests	2012-11-08 16:06:32 +08:00
TestLua	Removed some unused codes about "enableRetinaDisplay".	2012-10-24 16:12:40 +08:00