mirror of
https://github.com/ARMSX2/ARMSX2.git
synced 2026-08-24 16:50:16 -07:00
Resolve two conflicts: Threading.h: keep upstream's doc comment for SetNicePriority VMManager.cpp: keep our iOS-aware guard that suppresses the controller warning on both Android and iOS, replacing upstream's Android-only comment-out hack