src/FirmwarePlugin/APM/APMFirmwarePlugin.h · d88271399d89b7b1ded6fe5285e33216a1929ea1 · Valentin Platzgummer / qgroundcontrol · GitLab

Oct 10, 2015
e0da3a72
Merge remote-tracking branch 'origin/master' into apmseveritybugfix · e0da3a72
Pritam Ghanghas authored Oct 10, 2015
```
Conflicts:
	src/FirmwarePlugin/APM/APMFirmwarePlugin.h
```
e0da3a72
Merge remote-tracking branch 'origin/master' into apmseveritybugfix
Pritam Ghanghas authored Oct 10, 2015
```
Conflicts:
	src/FirmwarePlugin/APM/APMFirmwarePlugin.h
```