Merge branch 'master' into dev

This commit is contained in:
Feng Lee 2015-05-04 21:50:42 +08:00
commit 6a2df8adac
1 changed files with 2 additions and 0 deletions

View File

@ -96,6 +96,8 @@ The MIT License (MIT)
[@desoulter](https://github.com/desoulter)
[@turtleDeng](https://github.com/turtleDeng)
[@Hades32](https://github.com/Hades32)
[@huangdan](https://github.com/huangdan)
## Author