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
..
CCMotionStreak.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-08 14:14:13 +08:00
CCMotionStreak.h	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-08 14:14:13 +08:00
CCProgressTimer.cpp	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
CCProgressTimer.h	fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works.	2012-05-24 17:48:05 +08:00
CCRenderTexture.cpp	fixed #1297: fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().	2012-06-06 15:56:55 +08:00
CCRenderTexture.h	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00