From 2fa1b04cd430315f3abf45dcdd4975c0117ac98a Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Fri, 16 Mar 2018 18:02:57 +0100
Subject: Various text and ui changes: Added description to CSV export. Added
 line to delete instance error message. Changed delete instance icon for the
 list of instances. Added red X in the resources, thanks to twizz0r.

---
 src/resources.qrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index 618d3cfc..1cfc58a3 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -72,6 +72,7 @@
         <file alias="package">resources/package.png</file>
         <file alias="instance_switch">resources/switch-instance-icon.png</file>
         <file alias="open_folder">resources/open-Folder-Icon.png</file>
+        <file alias="multiply_red">resources/multiply-red.png</file>
     </qresource>
     <qresource prefix="/MO/gui/content">
         <file alias="plugin">resources/contents/jigsaw-piece.png</file>
-- 
cgit v1.3.1


From 8095be550f65b77f36c06cc731c8bfb0b9dad8c4 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Sat, 17 Mar 2018 00:58:55 +0100
Subject: Added archive-conflict icons to resources.

---
 src/resources.qrc                          |   4 ++++
 src/resources/archive-conflict-loser.png   | Bin 0 -> 18052 bytes
 src/resources/archive-conflict-mixed.png   | Bin 0 -> 18052 bytes
 src/resources/archive-conflict-neutral.png | Bin 0 -> 18052 bytes
 src/resources/archive-conflict-winner.png  | Bin 0 -> 18052 bytes
 5 files changed, 4 insertions(+)
 create mode 100644 src/resources/archive-conflict-loser.png
 create mode 100644 src/resources/archive-conflict-mixed.png
 create mode 100644 src/resources/archive-conflict-neutral.png
 create mode 100644 src/resources/archive-conflict-winner.png

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index 1cfc58a3..0197b606 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -73,6 +73,10 @@
         <file alias="instance_switch">resources/switch-instance-icon.png</file>
         <file alias="open_folder">resources/open-Folder-Icon.png</file>
         <file alias="multiply_red">resources/multiply-red.png</file>
+        <file alias="archive_conflict_looser">resources/archive-conflict-looser.png</file>
+        <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file>
+        <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file>
+        <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file>
     </qresource>
     <qresource prefix="/MO/gui/content">
         <file alias="plugin">resources/contents/jigsaw-piece.png</file>
diff --git a/src/resources/archive-conflict-loser.png b/src/resources/archive-conflict-loser.png
new file mode 100644
index 00000000..77d2e0fa
Binary files /dev/null and b/src/resources/archive-conflict-loser.png differ
diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png
new file mode 100644
index 00000000..e71e0167
Binary files /dev/null and b/src/resources/archive-conflict-mixed.png differ
diff --git a/src/resources/archive-conflict-neutral.png b/src/resources/archive-conflict-neutral.png
new file mode 100644
index 00000000..aba45314
Binary files /dev/null and b/src/resources/archive-conflict-neutral.png differ
diff --git a/src/resources/archive-conflict-winner.png b/src/resources/archive-conflict-winner.png
new file mode 100644
index 00000000..f6260575
Binary files /dev/null and b/src/resources/archive-conflict-winner.png differ
-- 
cgit v1.3.1


From 2def87a143cae7521bc8da898fddda73f213d473 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Sat, 17 Mar 2018 12:42:15 +0100
Subject: Fixed a typo of the added resource.

---
 src/resources.qrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index 0197b606..1c7c92e1 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -73,7 +73,7 @@
         <file alias="instance_switch">resources/switch-instance-icon.png</file>
         <file alias="open_folder">resources/open-Folder-Icon.png</file>
         <file alias="multiply_red">resources/multiply-red.png</file>
-        <file alias="archive_conflict_looser">resources/archive-conflict-looser.png</file>
+        <file alias="archive_conflict_looser">resources/archive-conflict-loser.png</file>
         <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file>
         <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file>
         <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file>
-- 
cgit v1.3.1


From bbce6506cdf15b5965e12ca2b10063fa8d3b85c0 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Sat, 17 Mar 2018 14:41:43 +0100
Subject: Fixed another typo in the same resource

---
 src/resources.qrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index 1c7c92e1..14c8e533 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -73,7 +73,7 @@
         <file alias="instance_switch">resources/switch-instance-icon.png</file>
         <file alias="open_folder">resources/open-Folder-Icon.png</file>
         <file alias="multiply_red">resources/multiply-red.png</file>
-        <file alias="archive_conflict_looser">resources/archive-conflict-loser.png</file>
+        <file alias="archive_conflict_loser">resources/archive-conflict-loser.png</file>
         <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file>
         <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file>
         <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file>
-- 
cgit v1.3.1