James Chen 4ee7981630 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
# Conflicts:
#	cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm
#	cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp
2018-03-23 15:42:12 +08:00
S
Description
No description provided
MIT 361 MiB
Languages
C++ 50.7%
TypeScript 35.1%
JavaScript 4%
C 4%
Objective-C++ 1.7%
Other 4.4%