Merge branch 'master' into new_info_panels

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index 858cf39..db10aff 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -21,11 +21,15 @@
         <file>res/images/sliding_bar_right.png</file>
         <file>res/images/led_red.png</file>
         <file>res/images/led_red_s.png</file>
-        <file>res/images/friend_group.png</file>
         <file>res/images/list_item.png</file>
         <file>res/images/list_item_bottom.png</file>
         <file>res/images/list_item_middle.png</file>
         <file>res/images/list_item_top.png</file>
-               <file>res/dummy/nmealog.txt</file>
+        <file>res/images/sliding_bar_left_test.png</file>
+        <file>res/images/userpanel_mask.png</file>
+        <file>res/images/sliding_bar_right_test.png</file>
+        <file>res/images/gps_pos_accurate.png</file>
+        <file>res/images/gps_pos_coarse.png</file>
+        <file>res/images/friend_group.png</file>
     </qresource>
 </RCC>