James Chen a67ac821f7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-04 17:15:09 +08:00
..
cocos2dx_support	issue #2371: Updating LuaCocos2d.cpp.	2013-07-04 17:07:56 +08:00
lua	[NaCl] Remove missing functions from lua stdlib.	2013-06-20 12:56:15 -07:00
luajit	issue #2371: Adding scripting/lua/luajit/mac/libluajit.a	2013-07-04 17:11:13 +08:00
proj.android	issue #2276: Add scrollview sample test in cocosbuilder and modify some config	2013-06-21 10:43:02 +08:00
proj.blackberry	[BB] Updating project configuration after adding CocoStudio runtime.	2013-06-09 15:29:51 +08:00
proj.emscripten	issue #2276: Add scrollview sample test in cocosbuilder and modify some config	2013-06-21 10:43:02 +08:00
proj.ios	issue #2325: Updating project configuration, tested on iPad 3.	2013-06-24 18:32:06 +08:00
proj.linux	issue #2276: Add scrollview sample test in cocosbuilder and modify some config	2013-06-21 10:43:02 +08:00
proj.marmalade	issue #2276: Add scrollview sample test in cocosbuilder and modify some config	2013-06-21 10:43:02 +08:00
proj.nacl	issue #2103 modify some compile setup	2013-06-03 18:14:06 +08:00
proj.tizen	Fix compile error.	2013-06-20 19:20:27 +09:00
proj.win32	closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation.	2013-06-23 17:25:34 +08:00
script	issue #2276: Add OpenGL lua module	2013-06-25 14:55:57 +08:00
tolua	Fix all compiler warnings produced by gcc.	2013-03-05 17:01:00 -08:00