Donald Alan Morrison 5075a83271 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/kazmath/src/ray2.c		2012-08-25 00:00:27 -07:00
..
Classes	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-08-25 00:00:27 -07:00
Resources	fixed #1441: put hd and ipad resources into separate directory	2012-08-23 14:20:32 +08:00
proj.android	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox	2012-08-24 00:16:11 +08:00
proj.blackberry	Updated project configures of blackberry port.	2012-08-24 14:57:44 +08:00
proj.ios	fix some bugs while testing	2012-08-23 18:01:28 +08:00
proj.linux	use absolute path in CCFileUtils	2012-08-24 17:55:29 +08:00
proj.mac	fixed #1441: put hd and ipad resources into separate directory	2012-08-23 14:20:32 +08:00
proj.win32	issue #1437:make CCApplication::sharedApplication() return pointer	2012-08-21 15:28:43 +08:00
Android.mk	issue #1429: First commit CCEditBox for android port.	2012-08-22 09:47:04 +08:00