Skip to content

Commit

Permalink
Merge 1.9
Browse files Browse the repository at this point in the history 
# Conflicts:
#	cocos2d/core/platform/CCInputManager.js
#	index.js
  • Loading branch information
@jareguo
jareguo committed Jun 8, 2018
2 parents c70f6de + f1f2ce4 commit af46b94
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit af46b94

Please sign in to comment.