diff options
| author | Al12rs <gabriel.cortesi@outlook.com> | 2018-03-17 00:58:55 +0100 |
|---|---|---|
| committer | Al12rs <gabriel.cortesi@outlook.com> | 2018-03-17 00:58:55 +0100 |
| commit | 8095be550f65b77f36c06cc731c8bfb0b9dad8c4 (patch) | |
| tree | c6f041c2d16910eec265862aa8434e4531b79ebf /src/resources | |
| parent | 2fa1b04cd430315f3abf45dcdd4975c0117ac98a (diff) | |
Added archive-conflict icons to resources.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/archive-conflict-loser.png | bin | 0 -> 18052 bytes |
| -rw-r--r-- | src/resources/archive-conflict-mixed.png | bin | 0 -> 18052 bytes |
| -rw-r--r-- | src/resources/archive-conflict-neutral.png | bin | 0 -> 18052 bytes |
| -rw-r--r-- | src/resources/archive-conflict-winner.png | bin | 0 -> 18052 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/archive-conflict-loser.png b/src/resources/archive-conflict-loser.png Binary files differnew file mode 100644 index 00000000..77d2e0fa --- /dev/null +++ b/src/resources/archive-conflict-loser.png diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png Binary files differnew file mode 100644 index 00000000..e71e0167 --- /dev/null +++ b/src/resources/archive-conflict-mixed.png diff --git a/src/resources/archive-conflict-neutral.png b/src/resources/archive-conflict-neutral.png Binary files differnew file mode 100644 index 00000000..aba45314 --- /dev/null +++ b/src/resources/archive-conflict-neutral.png diff --git a/src/resources/archive-conflict-winner.png b/src/resources/archive-conflict-winner.png Binary files differnew file mode 100644 index 00000000..f6260575 --- /dev/null +++ b/src/resources/archive-conflict-winner.png |
