Merge branch 'master' of github.com:elmindreda/glfw

This commit is contained in:
Camilla Berglund
2012-02-04 02:05:38 +01:00
38 changed files with 1940 additions and 345 deletions
+1 -1
View File
@@ -393,7 +393,7 @@ static int convertMacKeyCode(unsigned int macKeyCode)
if ([event modifierFlags] & NSCommandKeyMask)
{
if (!window->sysKeysDisabled)
if (window->systemKeys)
[super keyDown:event];
}
else