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
..
bindings-generator@b09d920cdb	Updating bindings-generator.	2013-07-02 18:24:31 +08:00
closure-compiler	improve obfuscate.py to be more reliable.	2013-04-06 22:00:52 +08:00
cocos2d-console@df447d6134	issue #2340: Updating submodule of cocos2d-console.	2013-06-27 17:19:22 +08:00
jenkins_scripts	Updating genbindings.sh, cxx-generator ~> bindings-generator.	2013-04-09 11:03:39 +08:00
project-creator	change the useage text	2013-07-01 14:10:14 +08:00
tojs	close #2285: Updating tools/tojs/cocos2d-x.ini.	2013-07-02 17:48:06 +08:00
tolua++	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac	2013-07-04 17:15:09 +08:00
travis-scripts	Fixing travis errors for generating JSB glue codes.	2013-06-26 16:57:08 +08:00
xcode4_template_generator	Regenerated xcode4 templates plist files due to missing few important files and causes compile error	2013-07-04 11:13:15 +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