zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb ... Conflicts: build/cocos2d-wp8.sln		2015-04-16 17:04:07 +08:00
..
bindings-generator@af67671bfd	Update the bindings-generator submodule	2015-03-28 15:00:12 +08:00
cocos2d-console@08eb1a23f8	Update cocos2d-console submodule	2015-04-14 16:43:03 +08:00
gen-prebuilt	Modify the gen-prebuilt tools for the lua-bindings modules.	2014-08-12 09:37:51 +08:00
jenkins-scripts	removed WP8 jenkins slave script	2015-04-15 07:18:13 -07:00
make-package	[ci skip]fix make package for lua runtime is removed	2015-03-13 15:29:05 +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
release	fix doxygen document generate tool restore doxygen.config file unexpectly	2015-03-23 14:35:38 +08:00
simulator/libsimulator	cleanup proj.android	2015-03-10 23:33:09 +08:00
tojs	Update the submodule js-bindings & update solution files for js-bindings.	2015-04-15 13:58:41 +08:00
tolua	Remove useless classes configuration for Lua binding	2015-04-14 15:02:25 +08:00
travis-scripts	Update cocos2dx files.	2015-04-15 15:12:04 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00