Merge remote-tracking branch 'upstream/master'

Browse Source

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

...

This commit is contained in:

furrtek

2016-04-21 20:36:19 +02:00

parent ba94ce55ef e4b86d149c

commit 1b0da68d65

252 changed files with 10752 additions and 7183 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/chibios-portapack/ext/fatfs/src/ff.c

+616 -544

File diff suppressed because it is too large Load Diff