[aseprite] 116/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 ab0c447be4d3ff4515b972c40696fd0b6c864212
Merge: cff6d1c 503c3c4
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Dec 15 18:19:28 2015 -0300

    Merge branch 'master'

 src/app/file/file.cpp                |  4 ++-
 src/app/filename_formatter.cpp       | 56 +++++++++++++++++++++++-------------
 src/app/filename_formatter.h         | 12 +++++++-
 src/app/filename_formatter_tests.cpp | 21 ++++++++++++++
 src/app/ui/editor/editor.cpp         |  1 +
 src/app/ui/editor/editor.h           |  1 +
 6 files changed, 73 insertions(+), 22 deletions(-)

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