Merge remote-tracking branch 'upstream/master'

Browse Source

# 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

...

This commit is contained in:

furrtek

2016-08-17 02:55:34 +02:00

parent e686c7437e 16a6d7efe0

commit 45a754645e

43 changed files with 1089 additions and 543 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

firmware/portapack-h1-firmware.bin

BIN

Binary file not shown.