pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 ... Conflicts: cocos/audio/winrt/Audio.cpp cocos/platform/winrt/CCCommon.cpp cocos/platform/winrt/CCWinRTUtils.cpp cocos/platform/winrt/CCWinRTUtils.h		2015-08-27 10:40:04 +08:00
..
bindings-generator@9509466075	Remove duplicate function definition, Add function adaptation	2015-08-17 18:18:38 +08:00
cocos2d-console@597bba8f77	Update the reference of submodule cocos2d-console.	2015-08-17 17:16:21 +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
release	fix doxygen document generate tool restore doxygen.config file unexpectly	2015-03-23 14:35:38 +08:00
simulator	Update changelog and versions for v3.8 rc0	2015-08-22 11:56:25 +08:00
tojs	Add BlendFuncFrame auto binding	2015-08-26 13:42:52 +08:00
tolua	add missing ui test in Lua	2015-08-20 15:25:09 +08:00
travis-scripts	Made travis run for v3.8	2015-08-18 10:17:44 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00