WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon ... Conflicts: cocos/2d/MarchingSquare.cpp		2015-06-08 13:59:26 +08:00
..
bindings-generator@3407739ca2	Merge branch 'modifyTestResource' into jsWebviewTest	2015-05-26 17:49:17 +08:00
cocos2d-console@caaaef354e	Update the reference of submodule cocos2d-console.	2015-06-04 15:30:45 +08:00
gen-prebuilt	Remove vs2012 support in v3	2015-05-05 16:11:26 +08:00
jenkins-scripts	skip ci build for v3-doc	2015-06-01 11:14:43 +08:00
make-package	[ci skip]fix make package for lua runtime is removed	2015-03-13 15:29:05 +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	fix simulator compile error	2015-06-03 22:58:25 +08:00
tojs	Skip C++ invocation functions of Component	2015-06-04 20:05:30 +08:00
tolua	issue #12046: Add Lua bindings for material systems and related test cases.	2015-05-27 15:37:59 +08:00
travis-scripts	add ci skip to travis	2015-05-29 13:47:28 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00