sunzhuoshi 4a25684292 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master ... Conflicts: tools/jsbcc/src/main.cpp		2013-05-08 18:22:18 +08:00
..
bindings-generator@f330d3017c	Updating bindings-generator.	2013-04-25 21:10:10 +08:00
closure-compiler	improve obfuscate.py to be more reliable.	2013-04-06 22:00:52 +08:00
jenkins_scripts	Updating genbindings.sh, cxx-generator ~> bindings-generator.	2013-04-09 11:03:39 +08:00
jsbcc	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master	2013-05-08 18:22:18 +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	Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.	2013-04-25 14:32:52 +08:00
tolua++	Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.	2013-04-12 14:27:29 +08:00
xcode4_template_generator	fixed #1847: Updating template for iOS.	2013-04-17 12:44:55 +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