samuele3hu a2ebe428da Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix		2014-05-20 18:11:28 +08:00
..
bindings-generator@e9f1775eb8	issue #5255:Add Sprite3D test cases for Lua	2014-05-20 18:09:04 +08:00
cocos2d-console@edd24a1dcc	Update the reference of submodule cocos2d-console.	2014-05-20 15:03:43 +08:00
jenkins-scripts	[Jenkins][ci skip] Fix the path of android public project	2014-05-20 14:31:42 +08:00
make-package	Package the binary files of cocos2d-console in git-achive-all.	2014-05-19 13:48:50 +08:00
particle	do not generate backupFile if it is not needed for convert particle file yCoordFlipped	2014-05-09 20:07:46 -07:00
tolua	issue #5255:Add Sprite3D test cases for Lua	2014-05-20 18:09:04 +08:00
travis-scripts	Update config.gitingore	2014-05-15 18:29:54 +08:00