Merge branch 'master' into userinfo

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index f05aa75..5d39858 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -8,7 +8,6 @@
         <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>
@@ -24,7 +23,7 @@
         <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/images/user_info_item_bottom.png</file>
+           <file>res/images/user_info_item_bottom.png</file>
         <file>res/images/user_info_item_middle.png</file>
         <file>res/images/user_info_item_top.png</file>
         <file>res/images/sliding_bar_left_test.png</file>
@@ -34,5 +33,10 @@
         <file>res/images/gps_pos_coarse.png</file>
         <file>res/images/friend_group.png</file>
         <file>res/images/sight.png</file>
+        <file>res/images/aeroplane_icon_gray.png</file>
+        <file>res/images/car_icon_gray.png</file>
+        <file>res/images/rocket_icon_gray.png</file>
+        <file>res/images/walk_icon_gray.png</file>
+        <file>res/images/profile_pic_border.png</file>
     </qresource>
 </RCC>