Conflict

[speedfreak] / Client / routesavedialog.h

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index 6906bdd..8a0d539 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -50,6 +50,11 @@ private slots:
     void timerSatellitePictureTimeout();
     void timerRoutePictureTimeout();
     void gpsStatus();
+    void sendRoute();
+
+signals:
+    void sendroute();
+
 };
 
 #endif // ROUTESAVEDIALOG_H