diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2019-05-03 21:32:33 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2019-05-03 21:32:33 -0500 |
| commit | 179a73857125ee604f42b0d5c2d765183c86d2c7 (patch) | |
| tree | b9b3f9d62bd5640de839d150a53ab8ef119dab9c /src/resources | |
| parent | e2b799bd6b5cfd51969fefd1dab5e5b1b7e5f81c (diff) | |
| parent | 907c5468424b48774f5da2a6b5f96f26590987b0 (diff) | |
Merge pull request #695 from ModOrganizer2/Develop
Stage for Release 2.2.0
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/conflict-mixed-blue.png | bin | 0 -> 692 bytes |
| -rw-r--r-- | src/resources/conflict-overwrite-blue.png | bin | 0 -> 964 bytes |
| -rw-r--r-- | src/resources/conflict-overwritten-blue.png | bin | 0 -> 577 bytes |
| -rw-r--r-- | src/resources/red-archive-conflict-loser.png | bin | 0 -> 746 bytes |
| -rw-r--r-- | src/resources/tracked.png | bin | 0 -> 2284 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png Binary files differnew file mode 100644 index 00000000..2afbb304 --- /dev/null +++ b/src/resources/conflict-mixed-blue.png diff --git a/src/resources/conflict-overwrite-blue.png b/src/resources/conflict-overwrite-blue.png Binary files differnew file mode 100644 index 00000000..3247e7b7 --- /dev/null +++ b/src/resources/conflict-overwrite-blue.png diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png Binary files differnew file mode 100644 index 00000000..3a032a55 --- /dev/null +++ b/src/resources/conflict-overwritten-blue.png diff --git a/src/resources/red-archive-conflict-loser.png b/src/resources/red-archive-conflict-loser.png Binary files differnew file mode 100644 index 00000000..18284ee2 --- /dev/null +++ b/src/resources/red-archive-conflict-loser.png diff --git a/src/resources/tracked.png b/src/resources/tracked.png Binary files differnew file mode 100644 index 00000000..6aab3023 --- /dev/null +++ b/src/resources/tracked.png |
