mirror of
https://github.com/elasota/Aerofoil.git
synced 2026-03-01 13:25:23 +00:00
Merge branch 'master' into mac
# Conflicts: # AerofoilX/GpMain_SDL_X.cpp
This commit is contained in:
@@ -118,7 +118,6 @@ add_library(PortabilityLayer STATIC
|
||||
PortabilityLayer/SimpleGraphic.cpp
|
||||
PortabilityLayer/TextPlacer.cpp
|
||||
PortabilityLayer/UTF8.cpp
|
||||
PortabilityLayer/UTF16.cpp
|
||||
PortabilityLayer/WindowDef.cpp
|
||||
PortabilityLayer/WindowManager.cpp
|
||||
PortabilityLayer/WorkerThread.cpp
|
||||
|
||||
Reference in New Issue
Block a user