James Chen 395dbc90aa Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance ... Conflicts: lua/cocos2dx_support/LuaCocos2d.cpp		2012-05-02 18:23:16 +08:00
..
cocos2dx_support	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
lua	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
proj.android/jni	fixed #1201: simplify the writing of Android.mk and correct corresponding template	2012-05-02 17:29:16 +08:00
proj.win32	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
tolua	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00