diff options
| author | Al <gabriel.cortesi@outlook.com> | 2018-03-18 10:06:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-18 10:06:04 +0100 |
| commit | b71d472e08701821a31c7ad48dcad04fe97b2d53 (patch) | |
| tree | 98158c9d539c30256eadc076c755a47d84329e12 /src/resources | |
| parent | a4b0524c70f719849a6d99096138b096e0339e30 (diff) | |
| parent | bbce6506cdf15b5965e12ca2b10063fa8d3b85c0 (diff) | |
Merge pull request #276 from Al12rs/Develop
Disabled iniTweaks, added resources, a few ui fixes and text changes.
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 |
| -rw-r--r-- | src/resources/multiply-red.png | bin | 0 -> 16018 bytes |
5 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 diff --git a/src/resources/multiply-red.png b/src/resources/multiply-red.png Binary files differnew file mode 100644 index 00000000..c238f07f --- /dev/null +++ b/src/resources/multiply-red.png |
