qgroundcontrol.pro · 5c72de31c5eb6cc09efd0b7ea555026ee13443b9 · Valentin Platzgummer / qgroundcontrol · GitLab

Mar 20, 2018
e33c30c5
Merge branch 'pull_upstream' into feature/offlineElevationData · e33c30c5
Andreas Bircher authored Mar 20, 2018
```
Conflicts:
	qgroundcontrol.pro
	src/Terrain.cc
	src/Terrain.h
```
e33c30c5
Merge branch 'pull_upstream' into feature/offlineElevationData
Andreas Bircher authored Mar 20, 2018
```
Conflicts:
	qgroundcontrol.pro
	src/Terrain.cc
	src/Terrain.h
```