Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
badboy-tian committed May 4, 2017
2 parents 3c79f12 + 5497a73 commit 4217546
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

## 展示

<img src="docs/screenshot-1.gif" width="500px"/>
<img src="docs/screenshot-3.gif" width="500px"/>
<img src="docs/screenshot-2.gif" width="500px"/>
<img src="docs/screenshot-1.gif" width="600px"/>
<img src="docs/screenshot-3.gif" width="600px"/>
<img src="docs/screenshot-2.gif" width="600px"/>

##特性
* 支持最新版的[Cocos Studio](http://www.cocos.com/download/)进行开发,版本号v3.10
Expand Down

0 comments on commit 4217546

Please sign in to comment.