samuele3hu b3da322920 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj		2014-06-26 16:21:09 +08:00
..
bindings-generator@07957e6a06	Add VideoPlayer Lua bindings and update bindings-generator submodule	2014-06-26 16:19:22 +08:00
cocos2d-console@b911aa4504	Update the reference of submodule cocos2d-console.	2014-06-19 14:47:16 +08:00
jenkins-scripts	send email notification if build failed	2014-06-23 11:01:41 +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	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer	2014-06-26 16:21:09 +08:00
travis-scripts	Update config.gitingore	2014-05-15 18:29:54 +08:00