Merged definition and initialization of conflictSeverity.

[toast/confclerk.git] / src / icons.qrc

diff --git a/src/icons.qrc b/src/icons.qrc
index 12faa0d4368056c1f005f6b13d1097aa2404d1f0..dacc91f28bda6c92b0ed5a2057f94a2f4417c633 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -2,15 +2,16 @@
     <qresource prefix="/">
         <file>icons/add.png</file>
         <file>icons/remove.png</file>
     <qresource prefix="/">
         <file>icons/add.png</file>
         <file>icons/remove.png</file>

+        <file>icons/expand.png</file>
+        <file>icons/collapse.png</file>

         <file>icons/reload.png</file>
         <file>icons/reload.png</file>

-        <file>icons/fosdem.png</file>
-        <file>icons/brain-alone.png</file>
-        <file>icons/appointment-soon-off.png</file>
-        <file>icons/appointment-soon.png</file>
-        <file>icons/applications-internet.png</file>
-        <file>icons/emblem-new-off.png</file>
-        <file>icons/emblem-new.png</file>

         <file>icons/dialog-warning.png</file>
         <file>icons/search.png</file>
         <file>icons/dialog-warning.png</file>
         <file>icons/search.png</file>

+        <file>icons/today.png</file>
+        <file>icons/favourite-no.png</file>
+        <file>icons/favourite-weak.png</file>
+        <file>icons/favourite-strong.png</file>
+        <file>icons/alarm-on.png</file>
+        <file>icons/alarm-off.png</file>

     </qresource>
 </RCC>
     </qresource>
 </RCC>