bmanGH 7513e8d643 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: cocos/scripting/auto-generated tools/bindings-generator		2014-01-20 12:18:36 +08:00
..
android-mk-generator	fix path for windows	2013-11-15 18:05:24 +08:00
bindings-generator@b6f97d9fc2	issue #3626:Update the submodule	2014-01-17 10:19:58 +08:00
closure-compiler	fixes #3720	2014-01-15 19:44:57 -03:00
cocos2d-console@3556d41429	issue #2826: Updating cocos2d-console submodule.	2013-11-01 10:46:06 +08:00
cpp-best-practise-formatter	issue #3215: Updating comments for this tool.	2013-11-16 23:09:45 +08:00
jenkins-scripts	decode 'payload' to utf-8 and ignore invalid bytes	2014-01-17 17:13:33 +08:00
localvartoauto	#closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors	2013-08-22 13:40:57 +08:00
make-package	closed #2446: Add a tool to auto export releasing zip file	2013-08-26 16:57:10 +08:00
project-creator	update project file.	2014-01-16 18:12:53 +08:00
pylib	replace os.path.samefile	2013-10-30 16:43:19 +08:00
tojs	Merge pull request #5041 from Dhilan007/develop_label	2014-01-15 18:37:40 -08:00
tolua	issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases	2014-01-17 10:19:55 +08:00
travis-scripts	Wrong dir fix for travis ci.	2014-01-06 20:04:30 -08:00
__init__.py	add creating project script in root	2013-07-26 10:50:37 +08:00
android-emulator-README.md	Clearer description of command line options	2013-03-19 16:08:38 -07:00