[aseprite] 58/128: 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 f87cf93a55f13c9834ca6ff53004bbb9a4c75055
Merge: d363f29 34d4489
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Apr 25 14:05:48 2016 -0300

    Merge branch 'master'

 src/CMakeLists.txt         |  8 --------
 src/app/ui/brush_popup.cpp | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

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