Merge branch 'personalinfo' into friendlist

[situare] / src / images.qrc

diff --git a/src/images.qrc b/src/images.qrc
index f56a766..bf3d047 100644 (file)
--- a/src/images.qrc
+++ b/src/images.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
+<<<<<<< HEAD:src/images.qrc
         <file>resources/arrow_left.png</file>
         <file>resources/arrow_right.png</file>
         <file>resources/bkg_grid.png</file>
@@ -31,5 +32,21 @@
         <file>resources/list_item_bottom.png</file>
         <file>resources/list_item_middle.png</file>
         <file>resources/list_item_top.png</file>
+=======
+        <file>resources/zoom_in.png</file>
+        <file>resources/zoom_out.png</file>
+        <file>resources/clock.png</file>
+        <file>resources/compass.png</file>
+        <file>resources/envelope.png</file>
+        <file>resources/profile_pic_border.png</file>
+        <file>resources/situare_user.jpg</file>
+        <file>resources/send_position.png</file>
+        <file>resources/side_bar_left.png</file>
+        <file>resources/sliding_bar_left.png</file>
+        <file>resources/personal_info_bckgrnd.png</file>
+        <file>resources/refresh.png</file>
+        <file>resources/arrow_left.png</file>
+        <file>resources/arrow_right.png</file>
+>>>>>>> personalinfo:src/images.qrc
     </qresource>
 </RCC>