furrtek fdfa7c9776 Merge remote-tracking branch 'upstream/master' ... Conflicts: firmware/Makefile firmware/application/Makefile firmware/application/event_m0.cpp firmware/application/ui_setup.cpp firmware/application/ui_setup.hpp firmware/baseband/baseband_thread.cpp firmware/baseband/baseband_thread.hpp firmware/bootstrap/CMakeLists.txt firmware/common/message.hpp firmware/common/portapack_shared_memory.hpp hardware/.gitignore		2016-07-25 16:35:42 +02:00
..
portapack_h1/cpld/output_files	Merge remote-tracking branch 'upstream/master'	2016-07-25 16:35:42 +02:00
.gitignore	Ignore all CPLD output_files/ except *.svf.	2016-07-10 15:00:34 -07:00