James Chen 1ddb5d51b5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20		2012-05-29 17:13:21 +08:00
..
Classes	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance	2012-05-02 18:23:16 +08:00
Resources	issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp	2012-05-24 10:48:39 +08:00
proj.android	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
proj.ios	fixed #1177: modify project setting, because CCStd.h is moved into platform/ios	2012-05-29 16:23:57 +08:00
proj.win32	issue #1191: Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.	2012-05-04 11:16:57 +08:00