Vladimir Timofeev a689fc4c7e sync with upstream ... Conflicts: CMakeLists.txt		2014-11-20 12:19:00 +03:00
..
bindings-generator@87efa95573	Update bindings-generator submodule	2014-10-17 14:32:24 +08:00
cocos2d-console@36153464b9	Uses new version of cocos2d-console	2014-11-19 12:25:50 -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	skip getMeshArrayByName	2014-10-29 10:38:13 +08:00
travis-scripts	Permit plugin-x plugins to ship third-party libraries.	2014-11-13 09:20:09 -08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00