diff options
| author | Al12rs <gabriel.cortesi@outlook.com> | 2018-08-02 13:12:31 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:16:39 -0600 |
| commit | b05f56c8084fc95590f8a79b9d8a7faf4e0b1844 (patch) | |
| tree | f10eaeaf3e236e73cba13c708712be05eebae290 /src/resources.qrc | |
| parent | f9f70b224e25c2d5bff017fd08d32521d39d5b08 (diff) | |
Added red archive conflict icon and made the conflicts tab change font for files that come from an archive.
Diffstat (limited to 'src/resources.qrc')
| -rw-r--r-- | src/resources.qrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources.qrc b/src/resources.qrc index 9e4c9192..5ed1780e 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -50,7 +50,7 @@ <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file> <file alias="archive_loose_conflict_mixed">resources/conflict-mixed-blue.png</file> <file alias="archive_loose_conflict_overwrite">resources/conflict-overwrite-blue.png</file> - <file alias="archive_loose_conflict_overwritten">resources/conflict-overwritten-blue.png</file> + <file alias="archive_loose_conflict_overwritten">resources/red-archive-conflict-loser.png</file> <file alias="emblem_notes">resources/accessories-text-editor.png</file> <file alias="version_date">resources/x-office-calendar.png</file> <file alias="warning_16">resources/dialog-warning_16.png</file> |