mirror of
https://github.com/eried/portapack-mayhem.git
synced 2024-12-27 08:19:47 -05:00
1b0da68d65
Conflicts: firmware/application/Makefile firmware/application/core_control.cpp firmware/application/touch.cpp firmware/application/ui_debug.cpp firmware/application/ui_debug.hpp firmware/application/ui_navigation.cpp firmware/baseband/baseband_thread.cpp |
||
---|---|---|
.. | ||
hal/platforms | ||
ports/GCC/ARMCMx | ||
various/fatfs_bindings |