Nicolas Gramlich 4378731418 Merge with gles20.		2012-06-11 10:43:07 -07:00
..
android	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
include	fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.	2012-05-02 10:39:17 +08:00
ios	fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.	2012-05-02 10:39:17 +08:00
proj.win32	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
win32	Merge with gles20.	2012-06-11 10:43:07 -07:00