[aseprite] 151/196: Merge branch 'cli-options-for-thumbnails'

[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 5847624d0e1e525715a9d51bd039cae21eae3925
Merge: 42e8682 e28881f
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Apr 4 13:12:30 2016 -0300

    Merge branch 'cli-options-for-thumbnails'

 src/app/app.cpp         | 64 ++++++++++++++++++++++++++++++++++++++++++-------
 src/app/app_options.cpp |  4 +++-
 src/app/app_options.h   |  4 ++++
 3 files changed, 62 insertions(+), 10 deletions(-)

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