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	issue #2732: [iOS] Updating the reference of auto-generated binding glue codes.	2013-08-27 16:05:48 +08:00
proj.android	fix warnings on ndk-r9	2013-08-26 18:02:51 +08:00
proj.ios	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.mac	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +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