2 Commits

Author	SHA1	Message	Date
furrtek	45a754645e	Merge remote-tracking branch 'upstream/master' ... # Conflicts: # firmware/application/bitmap.hpp # firmware/application/receiver_model.cpp # firmware/application/receiver_model.hpp # firmware/application/touch.hpp # firmware/application/ui_setup.cpp # firmware/baseband/proc_ais.hpp # firmware/baseband/proc_ert.hpp # firmware/bootstrap/CMakeLists.txt # firmware/common/portapack_persistent_memory.cpp # firmware/common/portapack_persistent_memory.hpp	2016-08-17 02:55:34 +02:00
furrtek	739956b42b	Sync with Sharebrained's fw, only Xylos TX works for now	2016-07-27 03:03:40 +02:00