Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 ... # Conflicts: # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters		2015-06-17 13:04:24 +08:00
..
bindings-generator@b384d93865	Update the bindings-generator	2015-06-16 11:38:16 +08:00
cocos2d-console@caaaef354e	Update the reference of submodule cocos2d-console.	2015-06-12 18:32:23 +08:00
framework-compile	Add scripts for framework compiling.	2015-06-15 16:33:24 +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	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation	2015-06-16 11:36:11 +08:00
tojs	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon	2015-06-15 16:13:36 +08:00
tolua	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2	2015-06-17 13:04:24 +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