wangshuai d5cdba484e Merge branch 'master' into feature_1802 ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-03-07 14:32:31 +08:00
..
Classes	Getting full path in before playing sound.	2013-01-27 19:20:49 +08:00
Resources	Merge branch 'master' into feature_1802	2013-03-07 14:32:31 +08:00
proj.android	fix some logical errors and compiling errors	2013-01-28 23:19:57 +08:00
proj.blackberry	issue #1683: Updating CCFileUtils for Blackberry and Marmalade.	2013-01-28 20:12:48 +08:00
proj.ios	issue #1689:modify lua samples to make them work correctly	2013-02-04 14:50:45 +08:00
proj.linux	Improved build system from linux.	2013-03-06 13:02:55 -08:00
proj.marmalade	issue #1689:modify lua samples to make them work correctly	2013-02-04 14:50:45 +08:00
proj.nacl	Use same top level Makefile for nacl and linux builds.	2013-03-06 13:02:55 -08:00
proj.win32	Detect VS2012 Update 1	2013-01-10 11:55:30 +01:00
.gitignore	repair linux cli build	2012-12-22 04:14:15 +04:00