[aseprite] 04/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 6889b080905458fed70a403e75bbc136ee3a655c
Merge: 6962e2c 51939c5
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Nov 13 11:08:39 2015 -0300

    Merge branch 'master'

 src/app/ui/editor/editor.h       | 2 +-
 src/app/ui/editor/editor_state.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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