src/Terrain/TerrainQuery.cc · 5c72de31c5eb6cc09efd0b7ea555026ee13443b9 · Valentin Platzgummer / qgroundcontrol · GitLab

Mar 21, 2018
5c72de31
Merge branch 'feature/offlineElevationData' into feature/offlineElevationDataBinary · 5c72de31
Andreas Bircher authored Mar 21, 2018
```
Conflicts:
	src/Terrain.cc
	src/TerrainTile.cc
	src/TerrainTile.h
```
5c72de31
Merge branch 'feature/offlineElevationData' into feature/offlineElevationDataBinary
Andreas Bircher authored Mar 21, 2018
```
Conflicts:
	src/Terrain.cc
	src/TerrainTile.cc
	src/TerrainTile.h
```