Skip to content

Fix some issues introduced in v1.2#1029

Merged
nantas merged 5 commits into
cocos:v1.2from
pandamicro:v1.2
Aug 12, 2016
Merged

Fix some issues introduced in v1.2#1029
nantas merged 5 commits into
cocos:v1.2from
pandamicro:v1.2

Conversation

@pandamicro
Copy link
Copy Markdown
Contributor

Changes proposed in this pull request:

Makes sure these boxes are checked before submitting your PR - thank you!

  • If your pull request has gone "stale", you should rebase your work on top of the latest version of the upstream branch.
  • If your commit history is full of small, unimportant commits (such as "fix pep8" or "update tests"), squash your commits down to a few, or one, discreet changesets before submitting a pull request.
  • To official teams:
    • Check that your javascript is following our style guide and end files with a newline
    • Document new code with comments in source code based on API Docs

@cocos-creator/engine-admins

@jareguo
Copy link
Copy Markdown
Contributor

jareguo commented Aug 12, 2016

LGTM

@nantas
Copy link
Copy Markdown
Contributor

nantas commented Aug 12, 2016

lgtm

@nantas nantas merged commit b474a9d into cocos:v1.2 Aug 12, 2016
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.

3 participants