[aseprite] 75/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 f3c171ddbeaeb06f96f541f44973242dcfdbe67e
Merge: e63dea6 850bd7b
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Dec 9 11:29:50 2015 -0300

    Merge branch 'master'

 src/app/log.cpp    |  1 +
 src/base/fs_unix.h | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

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