Merge branch 'experimental' of git://github.com/amolinap/qgroundcontrol into experimental
Conflicts: qgroundcontrol.pro src/ui/MainWindow.cc src/ui/SlugsDataSensorView.ui
Showing
This diff is collapsed.
Please register or sign in to comment