mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-03 17:33:05 +00:00
7fe3bdebc0
This is a manual merge with some conflict fixups. Conflicts: backends/platform/iphone/iphone_video.mm