[aseprite] 147/196: Merge branch range-and-shrink-command-line-options

[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 c6482da7612b075e4eaf82e9cc581eb9827b2b0f
Merge: f25c030 34c1af0
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Apr 4 13:09:32 2016 -0300

    Merge branch range-and-shrink-command-line-options
    
    # Conflicts:
    #	third_party/libpng
    #	third_party/zlib

 src/app/app.cpp         | 36 ++++++++++++++++++++++++++++++++++--
 src/app/app_options.cpp |  2 ++
 src/app/app_options.h   |  4 ++++
 3 files changed, 40 insertions(+), 2 deletions(-)

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