lihex 00a364e66f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json		2014-03-12 14:13:20 +08:00
..
bindings-generator@cd30a5b87d	Re-add bindings-generator submodule.	2014-03-10 17:46:30 +08:00
cocos2d-console@6605a5de18	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-03-12 14:13:20 +08:00
jenkins-scripts	Updates pull-request-builder.py, do 'git clean -fdx -f' after checkout a new branch.	2014-03-11 22:05:50 +08:00
make-package	closed #2446: Add a tool to auto export releasing zip file	2013-08-26 16:57:10 +08:00
tolua	rename gui to ui	2014-03-12 10:46:49 +08:00
travis-scripts	travis builds all tests projects for Android.	2014-03-11 19:10:36 +08:00