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
..
Classes	Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade	2012-11-12 10:20:04 +08:00
Resources	Marmalade Sample data removed and merged changes	2012-10-25 21:40:37 +01:00
proj.android	fixed #1481: merge Nicolas's pull request and do some bug fixes	2012-09-21 17:01:19 +08:00
proj.blackberry	Resource file searching implementation for blackberry.	2012-08-27 13:48:17 +08:00
proj.ios	fixed #1548: Updated libcurl header files to 7.26.0 on iOS.	2012-11-05 13:13:46 +08:00
proj.linux	fix compiling error on linux 64 bit	2012-11-01 15:38:48 +08:00
proj.mac	fixed #1512: add VisableRect.cpp/h into iOS and mac project	2012-10-24 10:09:25 +08:00
proj.marmalade	Marmalade Sample data removed and merged changes	2012-10-25 21:40:37 +01:00
proj.win32	issue #1521: Using relative coordinates in TestCpp.	2012-10-23 17:48:50 +08:00
Android.mk	issue #1521: Using relative coordinates in TestCpp.	2012-10-23 17:48:50 +08:00