[aseprite] 12/196: Merge branch 'add-win-key-modifier' of https://github.com/sirblackheart/aseprite into 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 cd8dabb3d20261010feed2622f25cc62e8280025
Merge: cfb9487 cb92b78
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Mar 2 09:38:06 2016 -0300

    Merge branch 'add-win-key-modifier' of https://github.com/sirblackheart/aseprite into sirblackheart-add-win-key-modifier

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

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