James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/CCScheduler.h cocos2dx/include/ccTypes.h		2012-06-08 14:14:13 +08:00
..
CCEventType.h	fixed #1185: reload image data and recreate buffer of object when backing to foreground	2012-04-24 15:02:18 +08:00
CCProtocols.h	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
ccConfig.h	fixed #1180: synchronize CCConfiguration	2012-04-20 11:39:12 +08:00
ccMacros.h	fixed #1185: reload image data and recreate buffer of object when backing to foreground	2012-04-24 15:02:18 +08:00
ccTypes.h	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-08 14:14:13 +08:00
cocos2d.h	fixed #1189: updated linebreak and tab(4 space) for all source files.	2012-04-25 18:17:04 +08:00
cocos2dExt.h	issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.	2012-04-27 18:47:49 +08:00