samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer ... Conflicts: tests/lua-tests/src/mainMenu.lua tools/bindings-generator tools/tolua/cocos2dx_physics.ini		2014-07-08 14:57:19 +08:00
..
bindings-generator@8d7a91449a	Update the bindings-generaotr submodule	2014-07-01 13:49:14 +08:00
cocos2d-console@7fc616bcbc	Add configuration in templates to set the bundle identity of Mac & iOS project.	2014-07-08 10:22:08 +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-07-08 14:57:19 +08:00
travis-scripts	[ci skip]update travis ci to use ndk-r9d	2014-07-03 11:02:04 +08:00