Merge heads.
commitdba7644dc4c2ae46003d9a51a499a65567530f99
authorStephanie Gawroriski <xer@multiphasicapps.net>
Thu, 3 Oct 2024 21:04:09 +0000 (3 21:04 +0000)
committerStephanie Gawroriski <xer@multiphasicapps.net>
Thu, 3 Oct 2024 21:04:09 +0000 (3 21:04 +0000)
treefb48eeb2018dafde82cc9b117eb0b56fe1d9c3d4
parent138f2cc9ec42fc15e69f406774b7282241367d6c
parent47c26b266818043613aa0ba665ef9bf7304762b5
Merge heads.
.idea/gradle.xml
.idea/modules/squirreljme.iml
emulators/emulator-base-native/CMakeLists.txt
nanocoat/include/sjme/config.h
nanocoat/lib/base/CMakeLists.txt