[aseprite] 16/196: Merge branch 'sirblackheart-add-win-key-modifier'

[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 f9238cd77b06a3dac2b8a41eec96b0ffe70f2c62
Merge: cfb9487 645486f
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Mar 2 12:34:06 2016 -0300

    Merge branch 'sirblackheart-add-win-key-modifier'

 data/widgets/select_accelerator.xml |  1 +
 src/app/ui/select_accelerator.cpp   | 11 ++++++++++-
 src/app/ui/select_accelerator.h     |  4 +++-
 src/she/alleg4/key_poller.cpp       |  4 +++-
 src/she/keys.h                      |  3 ++-
 src/she/win/vk.cpp                  |  3 +++
 src/ui/accelerator.cpp              | 17 ++++++++++++++++-
 src/ui/accelerator.h                |  4 +++-
 src/ui/keys.h                       |  1 +
 src/ui/message.cpp                  |  3 ++-
 src/ui/message.h                    |  2 ++
 11 files changed, 46 insertions(+), 7 deletions(-)

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