pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: docs/RELEASE_NOTES.md web		2015-07-15 14:39:40 +08:00
..
cpp-template-default	change sign team to none.	2015-07-07 22:02:35 +08:00
js-template-default	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-15 14:39:40 +08:00
js-template-runtime	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-15 14:39:40 +08:00
lua-template-default	change sign team to none.	2015-07-07 22:02:35 +08:00
lua-template-runtime	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
cocos2dx_files.json	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-15 14:39:40 +08:00