Skip to content

Commit

Permalink
Merge pull request cocos#225 from cocos-creator/v1.2
Browse files Browse the repository at this point in the history 
merge V1.2
  • Loading branch information
@nantas
nantas authored Aug 19, 2016
2 parents 97d5539 + e3f8ff0 commit 43929b6
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 98 deletions.
Loading

0 comments on commit 43929b6

Please sign in to comment.