[aseprite] 278/308: Merge branch 'new-log'

[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 bc9c3b0ec268807e0f99bbe763ea3b134019e956
Merge: 873ca55 5fbb4e9
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Feb 26 17:11:51 2016 -0300

    Merge branch 'new-log'

 src/app/app.cpp             |  23 +++++++---
 src/app/app_options.cpp     |  11 +++--
 src/app/app_options.h       |  13 ++++--
 src/app/log.cpp             |  23 +++++-----
 src/app/log.h               |   9 +---
 src/app/resource_finder.cpp |  42 ++++++++++++++++++-
 src/app/resource_finder.h   |   4 +-
 src/base/log.cpp            | 100 +++++++++++++++++++++++++++++++++-----------
 src/base/log.h              |  37 ++++++++++++----
 9 files changed, 198 insertions(+), 64 deletions(-)

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