James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated ... Conflicts: scripting/auto-generated		2013-08-27 16:59:59 +08:00
..
Classes	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
Resources	issue #2433:Add lua deprecated fiel and modify some test samples	2013-08-23 16:12:59 +08:00
proj.android	fix warnings on ndk-r9	2013-08-26 18:02:51 +08:00
proj.emscripten	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
proj.ios	…
proj.linux	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
proj.mac	…
proj.nacl	…
proj.tizen	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
proj.win32	issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files.	2013-08-27 16:46:31 +08:00
.gitignore	…