Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol into checkRemote
Conflicts: src/ui/MapWidget.h
Showing
price.txt
0 → 100644
This diff is collapsed.
src/ui/PFD.cc
deleted
100644 → 0
src/ui/PFD.h
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
src/ui/map/MAV2DIcon.cc
0 → 100644
src/ui/map/MAV2DIcon.h
0 → 100644
src/ui/map/QGC2DIcon.cc
0 → 100644
src/ui/map/QGC2DIcon.h
0 → 100644
src/ui/map/Waypoint2DIcon.cc
0 → 100644
src/ui/map/Waypoint2DIcon.h
0 → 100644
Please register or sign in to comment