James Chen 2c0cc603d1 Merge branch 'master' into develop ... Conflicts: extensions/cocos-ext.h		2013-06-18 10:46:25 +08:00
..
bindings-generator@e3c5ee837f	Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.).	2013-06-14 14:15:04 +08:00
closure-compiler	improve obfuscate.py to be more reliable.	2013-04-06 22:00:52 +08:00
cocos2d-console@a44729e6b2	Adding submodule of cocos2d-console to 'tools' folder.	2013-06-02 10:53:46 +08:00
jenkins_scripts	Updating genbindings.sh, cxx-generator ~> bindings-generator.	2013-04-09 11:03:39 +08:00
lua_project_generator	Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.	2013-04-25 21:31:52 +08:00
project-creator	issue #1733, fix a typo in dumping usage.	2013-02-22 22:24:05 +08:00
tojs	Don't generate js binding glue code for CCMenuItem.*::initWithCallback.	2013-06-06 16:21:27 +08:00
tolua++	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
travis-scripts	Fix emscripten bugs.	2013-06-15 12:07:19 +08:00
xcode4_template_generator	Template fix for iOS Template.	2013-06-17 15:54:12 +08:00
android-buildsetup.sh	Setup user environment for building Android port.	2013-03-15 16:44:09 -07:00
android-emulator-README.md	Clearer description of command line options	2013-03-19 16:08:38 -07:00