[aseprite] 225/308: Merge branch 'fix-keys'

[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 19f8aad2ef986403837aa3ef82dcd0766deda2f4
Merge: ff0c2c2 882a67f
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Feb 12 12:24:19 2016 -0300

    Merge branch 'fix-keys'

 src/she/win/vk.cpp   | 33 ++++++++++++++++++++++++++-------
 src/she/win/window.h | 14 ++++++++++++--
 2 files changed, 38 insertions(+), 9 deletions(-)

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