TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-06 11:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,054 Commits 2 Branches 494 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
furrtek
1b0da68d65 Merge remote-tracking branch 'upstream/master' 
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
 2016-04-21 20:36:19 +02:00
Jared Boone
7ec476cb79 Rename m4_startup.* to more appropriate core_control.* 
Now that there is M0- and M4-related code.
 2016-02-16 11:09:00 -08:00