[aseprite] 140/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 e8ecbbb4d7f6cda65440943e720901e670aab244
Merge: 16e13d8 7ab8633
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Dec 22 10:56:56 2015 -0300

    Merge branch 'master'

 src/app/cmd.cpp              |  6 ++---
 src/app/file/gif_format.cpp  | 50 +++++++++++++++++++-------------------
 src/app/log.cpp              | 57 +++++++++-----------------------------------
 src/base/CMakeLists.txt      |  1 +
 src/base/log.cpp             | 56 +++++++++++++++++++++++++++++++++++++++++++
 src/base/log.h               | 19 +++++++++++++++
 src/config.h                 | 11 +--------
 src/updater/check_update.cpp |  4 ++--
 8 files changed, 118 insertions(+), 86 deletions(-)


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