pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp docs/RELEASE_NOTES.md tools/cocos2d-console tools/tojs/cocos2dx.ini		2015-07-21 11:39:24 +08:00
..
bindings-generator@c3b5130e3b	Update bindings-generator	2015-07-15 14:21:47 +08:00
cocos2d-console@f3768083be	Update the reference of submodule cocos2d-console.	2015-07-17 10:08:35 +08:00
framework-compile	add cocos framework build on linux platform.	2015-07-14 16:25:54 +08:00
gen-prebuilt	Remove vs2012 support in v3	2015-05-05 16:11:26 +08:00
jenkins-scripts	add xcpretty to framework mac build	2015-07-17 10:48:05 +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
release	fix doxygen document generate tool restore doxygen.config file unexpectly	2015-03-23 14:35:38 +08:00
simulator	[Simulator JSB] Fix issue caused by video and web view binding	2015-07-07 09:38:38 +08:00
tojs	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-21 11:39:24 +08:00
tolua	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00
travis-scripts	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-15 14:39:40 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00