[aseprite] 143/308: Merge branch 'master'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 9c42a7b31bfd5d089a73f5f68544dd195fcb033e
Merge: 4c58441 3252013
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Dec 22 15:57:44 2015 -0300

    Merge branch 'master'

 src/app/tools/ink.h                 | 3 +++
 src/app/tools/inks.h                | 1 +
 src/app/ui/editor/brush_preview.cpp | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git