merging with master

5e2f4c32 · Valentin Platzgummer · 6f639865 · 5e2f4c32 · 5e2f4c32
Commit 5e2f4c32 authored Oct 01, 2020 by Valentin Platzgummer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

QGCExternalLibs.pri QGCExternalLibs.pri +1 -1

QGroundControl.AppImage deploy/QGroundControl.AppImage +0 -0

No files found.
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -198,7 +198,7 @@ contains (DEFINES, DISABLE_AIRMAP) {

 # GeograpicLib (TODO: add Windows support!)
 LinuxBuild {
-    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so
+    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so.17
 }

 # google or-tools (TODO: add Windows support!)

--- a/deploy/QGroundControl.AppImage
+++ b/deploy/QGroundControl.AppImage