Merge branch 'master' into beta

This commit is contained in:
David Capello 2016-12-28 12:45:13 -03:00
commit 288eb31e53

View File

@ -5,5 +5,5 @@ Describe your bug report or feature request here
### Aseprite and System version
* Aseprite (version number, installer/portable/Steam/beta/dev):
* System (Win/OSX/Linux, version, distribution):
* Aseprite version: version number, installer/portable/Steam/beta/dev/commit-hash
* System: Windows/macOS/Linux, version, distribution