James Chen 26763c200b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform ... Conflicts: tests/proj.ios/test.xcodeproj/project.pbxproj		2012-04-24 15:44:53 +08:00
..
Resources	finished CControlColourPickerTest.	2012-04-17 11:12:05 +08:00
proj.android	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-24 15:44:53 +08:00
proj.bada	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
proj.ios	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-24 15:44:53 +08:00
proj.linux	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
proj.marmalade	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
proj.qnx	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
proj.win32	issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.	2012-04-23 14:30:38 +08:00
tests	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-24 15:44:53 +08:00
Android.mk	issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.	2012-04-23 14:30:38 +08:00
AppDelegate.cpp	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
AppDelegate.h	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00