Merge branch 'master' into OP-372_Edouard_UDP-connection-menu-name

2025-01-30 15:52:12 +01:00 · 2011-04-18 08:44:58 +02:00 · 2011-04-18 08:44:58 +02:00 · f0bfffda09
commit f0bfffda09
parent cd1922cd52 48a0881dc4
3 changed files with 18 additions and 16 deletions
--- a/CREDITS.txt
+++ b/CREDITS.txt
@ -193,3 +193,4 @@ M: Architecture co-lead
 N: Alex Vrubel
 E: alex.vrubel (plus) openpilot (at) gmail (dot) com
 D: Russian translation of the GCS
+
--- a/ground/openpilotgcs/src/plugins/config/configgadget.qrc
+++ b/ground/openpilotgcs/src/plugins/config/configgadget.qrc
@ -12,5 +12,6 @@
        <file>images/PipXtreme.png</file>
        <file>images/gyroscope.svg</file>
        <file>images/Transmitter.png</file>
+        <file>images/help.png</file>
    </qresource>
 </RCC>
--- a/ground/openpilotgcs/src/plugins/config/images/help.png
+++ b/ground/openpilotgcs/src/plugins/config/images/help.png