samuele3hu 7198ae509c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-10-16 20:35:43 +08:00
..
bindings-generator@a8496d540c	Update bindings-generator submodule	2014-09-09 16:26:06 +08:00
cocos2d-console@36153464b9	Update the reference of submodule cocos2d-console.	2014-10-14 16:29:49 +08:00
gen-prebuilt	Modify the gen-prebuilt tools for the lua-bindings modules.	2014-08-12 09:37:51 +08:00
jenkins-scripts	add back	2014-10-15 01:45:44 +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_new_spine	2014-10-16 20:35:43 +08:00
travis-scripts	[ci skip]update travis ci to use ndk-r9d	2014-07-03 11:02:04 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00