pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: docs/RELEASE_NOTES.md web		2015-07-15 14:39:40 +08:00
..
bindings-generator@c3b5130e3b	Update bindings-generator	2015-07-15 14:21:47 +08:00
cocos2d-console@69f709f86f	update submodule	2015-07-14 10:10:20 +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	fix win32&win8.1 template compile	2015-07-15 10:00:35 +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	fix the jsb and lua ini error, ignore writeDataToFile	2015-07-07 14:54:31 +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