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.

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

send pause/resume event instead of background/foreground event #1947

Merged
merged 1 commit into from Dec 12, 2019

Conversation

minggo
Copy link
Contributor

@minggo minggo commented Nov 26, 2019

No description provided.

Copy link
Contributor

@cocos-robot cocos-robot left a comment

@minggo, v2.2.2 branch will be deleted, so we edited the base branch to v2.3.0, or this PR will be killed by GitHub.
Please review the commits history to ensure that the PR does not polluted by unneeded commits from your origin branch.
If you need to merge to other branch, you can first click the Edit button on the right side of the PR title, then switch the base branch.
If necessary, welcome to resubmit a new PR. Thanks!

PPpro
PPpro approved these changes Dec 11, 2019
@holycanvas
Copy link
Contributor

@holycanvas holycanvas commented Dec 12, 2019

cocos/2d-tasks#2085

@holycanvas holycanvas merged commit 87dc227 into cocos:v2.3.0 Dec 12, 2019
1 check passed
@minggo minggo mentioned this pull request Dec 13, 2019
@minggo minggo deleted the v2.2.2-manually-memory-control branch Jan 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants