James Chen b044a89d6f Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2012-12-06 14:55:18 +08:00
..
Classes	Removed some unused codes about "enableRetinaDisplay".	2012-10-24 16:12:40 +08:00
Resources	JPEG and File fixes	2012-12-04 11:03:34 +08:00
proj.android	Remove hardcoded android:debuggable property	2012-12-03 13:34:55 -08:00
proj.blackberry	Made all projects compiled ok on Blackberry port.	2012-11-30 12:40:47 +08:00
proj.ios	use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok	2012-11-26 15:08:40 +08:00
proj.linux	added lua support for linux platform	2012-11-19 14:56:02 +04:00
proj.marmalade	update lua marmalade project	2012-12-02 15:29:10 +01:00
proj.win32	issue #1565: Removed VS2008 support.	2012-11-19 14:42:27 +08:00