pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory ... Conflicts: cocos/base/ccConfig.h cocos/scripting/js-bindings/manual/ScriptingCore.cpp cocos/scripting/js-bindings/manual/ScriptingCore.h cocos/scripting/js-bindings/script/jsb_prepare.js		2016-01-18 16:40:00 +08:00
..
bindings-generator@54eff9fa73	Upgrade bindings generator	2015-12-19 17:18:39 +08:00
cocos2d-console@1ad9331a9e	update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97	2015-12-24 20:35:12 +08:00
jenkins-scripts	fix Jenkins template compile	2015-08-24 10:26:12 +08:00
make-package	Solve the error in git-archive-all tools.	2015-06-25 11:23:27 +08:00
particle	fixed 'seperate' typo	2015-04-25 00:02:39 +03:00
performance-analyze	Add tools for converting the performance tests data to excel files.	2015-09-14 09:52:21 +08:00
release	fix doxygen document generate tool restore doxygen.config file unexpectly	2015-03-23 14:35:38 +08:00
simulator	Merge pull request #14340 from fnz/easyjni	2016-01-12 11:50:16 +08:00
tojs	Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory	2016-01-18 16:40:00 +08:00
tolua	adds tvOS support	2015-12-28 15:59:36 -08:00
travis-scripts	Fixed binding...	2015-09-21 15:41:14 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00