Merge branch 'master' into stacked_friends

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index 25c1ec6..2601bb4 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -5,20 +5,24 @@
         <file>res/images/clock.png</file>
         <file>res/images/compass.png</file>
         <file>res/images/envelope.png</file>
-        <file>res/images/list_item.png</file>
         <file>res/images/zoom_in.png</file>
         <file>res/images/zoom_out.png</file>
         <file>res/images/personal_info_bckgrnd.png</file>
         <file>res/images/profile_pic_border.png</file>
         <file>res/images/refresh.png</file>
+        <file>res/images/refresh_s.png</file>
         <file>res/images/send_position.png</file>
+        <file>res/images/send_position_s.png</file>
         <file>res/images/side_bar_left.png</file>
         <file>res/images/side_bar_right.png</file>
         <file>res/images/sliding_bar_left.png</file>
         <file>res/images/sliding_bar_right.png</file>
-        <file>res/images/led_red_g.png</file>
-        <file>res/images/led_red_h.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>
     </qresource>
 </RCC>