[aseprite] 45/250: 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 4ff5f79035f19b98f60bb30884ce586fb2e0a960
Merge: dc6161a 1b79bd7
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Sep 17 10:37:21 2015 -0300

    Merge branch 'master'

 data/gui.xml                                |  3 ++
 src/app/commands/cmd_keyboard_shortcuts.cpp |  3 ++
 src/app/tools/tool_loop.h                   |  4 ---
 src/app/tools/tool_loop_manager.cpp         |  6 ++--
 src/app/tools/tool_loop_manager.h           | 11 +++---
 src/app/ui/editor/drawing_state.cpp         | 56 +++++++++++++++++++++++------
 src/app/ui/editor/drawing_state.h           |  5 +++
 src/app/ui/editor/editor.cpp                |  6 ++++
 src/app/ui/editor/editor.h                  |  7 ++++
 src/app/ui/editor/tool_loop_impl.cpp        |  5 +--
 src/app/ui/keyboard_shortcuts.cpp           |  7 ++++
 src/app/ui/keyboard_shortcuts.h             | 24 +++++++------
 12 files changed, 99 insertions(+), 38 deletions(-)

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