Skip to content

Commit 06b48a5

Browse files
stevetranbystevetranby
committed
Merge commit '0bd075e46703704db50a5fef749f0bb47879c9e7' into scgamex-v3
* commit '0bd075e46703704db50a5fef749f0bb47879c9e7': Fix Box2DTestBed keyboard error! (cocos2d#17741) JSB SocketIO.connect supports to pass a CA cert file (cocos2d#17736) Particle font size should be a const value (cocos2d#17676) remove APP_SHORT_COMMANDS setting (cocos2d#17722)
2 parents b6faa36 + 0bd075e commit 06b48a5

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)