Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync #4949 #5029

Merged
merged 2 commits into from
Jul 31, 2019
Merged

sync #4949 #5029

merged 2 commits into from
Jul 31, 2019

Commits on Jul 31, 2019

  1. fix issue cocos#4942 (cocos#4949)

    @2youyou2
    Heng authored and 2youyou2 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    2eed9e2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'fireball/v2.1.3' into v2.1.3

    @2youyou2
    2youyou2 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    cc5c688 View commit details
    Browse the repository at this point in the history