lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 ... Conflicts: cocos/2d/cocos2d.vcxproj.filters cocos/3d/CCBundle3D.cpp cocos/3d/CCBundle3D.h		2014-06-12 15:53:41 +08:00
..
bindings-generator@5f3bf19c5d	Update controller.lua for lua-tests and bindings-generator submoudle	2014-06-05 14:39:09 +08:00
cocos2d-console@3164639ee4	Update the reference of submodule cocos2d-console.	2014-06-09 11:27:01 +08:00
jenkins-scripts	[Jenkins][ci skip] Fix proxy address in post-build.py	2014-06-03 11:48:52 +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	Update README.md in tools/tolua	2014-05-28 09:43:48 +08:00
travis-scripts	Update config.gitingore	2014-05-15 18:29:54 +08:00