James Chen 0afdfe33da Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20		2012-06-15 15:25:37 +08:00
..
Resources	fixed #1327: Exported 'create' method for lua bindings.	2012-06-15 11:46:51 +08:00
proj.android	fixed #1322: vertical alignment works ok on android	2012-06-13 18:33:44 +08:00
proj.ios	issue #1292:make some function names more readable	2012-06-15 15:10:40 +08:00
proj.win32	fixed #1310: Updated vs2010 project configuration after synchronizing to rc2.	2012-06-15 15:24:22 +08:00
tests	Merge pull request #1028 from minggo/iss1292_moidify_function_name	2012-06-15 00:14:13 -07:00
Android.mk	Merge with gles20.	2012-06-13 15:56:52 -07:00
AppDelegate.cpp	issue #1324: Added create() for static member functions that new an autorelease object	2012-06-14 15:13:16 +08:00
AppDelegate.h	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00