samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj tools/tolua/cocos2dx.ini		2014-07-31 17:52:22 +08:00
..
bindings-generator@ee16f69272	Update bindings-generator submodule	2014-07-22 11:16:40 +08:00
cocos2d-console@97a87d1a93	Update the reference of submodule cocos2d-console.	2014-07-21 17:04:40 +08:00
gen-prebuilt	Add tools to generate prebuilt engine for Cocos Engine.	2014-07-30 15:44:15 +08:00
jenkins-scripts	fix ios build code sign	2014-07-30 23:59:19 +08:00
make-package	Add fbx-conv in 3rd-party-libs-bin's management.	2014-07-18 18:38:57 +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_module	2014-07-31 17:52:22 +08:00
travis-scripts	[ci skip]update travis ci to use ndk-r9d	2014-07-03 11:02:04 +08:00