Commit 552c219

committed

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2698_namespace

2 parents 2be3a49 + 8c2f8e2 commit 552c219Copy full SHA for 552c219

4 files changed

+331

-313

lines changed

cocos2d
- core
  - platform
    - CCTypesWebGL.js
  - sprites
    - CCSpriteFrameCache.js
- render-texture
  - CCRenderTextureCanvasRenderCmd.js
extensions/cocostudio/loader/parsers
- timelineParser-2.x.js

4 files changed

+331

-313

lines changed

Comments

(0)