Merge companion and firmware notes, and get them from the server (#5530)
commit04547a92067fef191c3a8669a8af8e83db5f315d
author3djc <lesitewebdejc@hotmail.com>
Mon, 18 Dec 2017 22:02:40 +0000 (18 23:02 +0100)
committerBertrand Songis <bsongis@gmail.com>
Mon, 18 Dec 2017 22:02:40 +0000 (18 23:02 +0100)
tree2a41302dc78b045d7354ea0160375c21286f8c58
parent7dd32c887833aa7f75fa38d3609392cceb6d8676
Merge companion and firmware notes, and get them from the server (#5530)
companion/src/mainwindow.cpp
companion/src/mainwindow.h