Merge remote-tracking branch 'upstream/master'

Browse Source

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

...

This commit is contained in:

furrtek

2016-07-25 16:35:42 +02:00

parent 518d7969bf fe1a6c09bb

commit fdfa7c9776

138 changed files with 17603 additions and 1930 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

11646

hardware/portapack_h1/cpld/output_files/portapack_h1_cpld.svf Normal file

File diff suppressed because it is too large Load Diff