Merge branch 'master' into km-stats-postflight
commit14bb0fca7291707656a20c63b315e3ba13904146
authorkrzysztofmatula <km@apnet.pl>
Sun, 21 Apr 2019 20:44:44 +0000 (21 22:44 +0200)
committerGitHub <noreply@github.com>
Sun, 21 Apr 2019 20:44:44 +0000 (21 22:44 +0200)
tree6568f8398d378c701dd00c68e284aa92a458c2c3
parent560f43a9dd744bf7d708a3e3edf61f5b3de0581f
parent94ddf5aceb1b7f67a418bfbc254fa000646c7472
Merge branch 'master' into km-stats-postflight
src/main/cli/settings.c
src/main/osd/osd.c
src/main/osd/osd.h