Merge branch 'master' into mac

# Conflicts:
#	AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp
#	PortabilityLayer/MenuManager.cpp
This commit is contained in:
Phil Marell
2021-08-05 18:46:18 +10:00
40 changed files with 448 additions and 190 deletions

View File

@@ -101,6 +101,8 @@ namespace GpKeySpecials
kRightCtrl, //
kLeftAlt,
kRightAlt,
kLeftCommand,
kRightCommand,
kNumLock,
kLeftArrow,
kUpArrow,