Merge branch 'master' into stacked_friends

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index db58073..2601bb4 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -19,6 +19,7 @@
         <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>