James Chen 85304b9441 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua		2012-08-24 10:27:20 +08:00
..
Classes	fix some bugs while testing	2012-08-23 18:01:28 +08:00
Resources	Adding lua scripting to BlackBerry port.	2012-08-21 13:32:28 -04:00
proj.android	issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class.	2012-08-24 00:24:04 +08:00
proj.blackberry	fixed #1112: Lua support for blackberry port.	2012-08-22 18:48:57 +08:00
proj.ios	issue #1437:make CCApplication::sharedApplication() return pointer	2012-08-21 15:28:43 +08:00
proj.win32	issue #1437:make CCApplication::sharedApplication() return pointer	2012-08-21 15:28:43 +08:00