Merge branch 'master' into gps

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index f825d3a..2d3b0d4 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -26,5 +26,6 @@
         <file>res/images/list_item_top.png</file>
         <file>res/images/show_position.png</file>
         <file>res/images/show_position_s.png</file>
+               <file>res/dummy/nmealog.txt</file>
     </qresource>
 </RCC>