James Chen cfbf29ccfc Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati		2012-06-01 13:47:23 +08:00
..
Classes	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
Resources	issue #1263: Removed unused files. Fixed an issue in uthash.h.	2012-05-28 13:59:18 +08:00
proj.android	Updated main.cpp for each project of android.	2012-05-31 10:13:05 +08:00
proj.ios	add CCBReader into project	2012-06-01 11:01:09 +08:00
proj.win32	fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.	2012-06-01 13:44:28 +08:00