XiaoFeng a804c67a12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d ... Conflicts: cocos/scripting/lua-bindings/manual/LuaBasicConversions.h		2015-12-02 15:07:58 +08:00
..
bindings-generator@2318a1593d	reset submodule	2015-12-02 13:28:24 +08:00
cocos2d-console@5089eb347b	reset submodule	2015-12-02 13:28:24 +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	update binding-generator sub module & code	2015-12-01 22:30:36 +08:00
tojs	resolve conflict and fix checktexture bug	2015-12-02 11:26:05 +08:00
tolua	fix script binding	2015-12-01 23:05:47 +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