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.qrc | |
| parent | e2b799bd6b5cfd51969fefd1dab5e5b1b7e5f81c (diff) | |
| parent | 907c5468424b48774f5da2a6b5f96f26590987b0 (diff) | |
Merge pull request #695 from ModOrganizer2/Develop
Stage for Release 2.2.0
Diffstat (limited to 'src/resources.qrc')
| -rw-r--r-- | src/resources.qrc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/resources.qrc b/src/resources.qrc index 1dccce0b..8645b27e 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -48,6 +48,9 @@ <file alias="emblem_conflict_overwrite">resources/conflict-overwrite.png</file> <file alias="emblem_conflict_overwritten">resources/conflict-overwritten.png</file> <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/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> @@ -79,6 +82,7 @@ <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file> <file alias="alternate_game_alt">resources/game-warning.png</file> <file alias="alternate_game">resources/game-warning-16.png</file> + <file alias="tracked">resources/tracked.png</file> </qresource> <qresource prefix="/MO/gui/content"> <file alias="plugin">resources/contents/jigsaw-piece.png</file> @@ -93,8 +97,8 @@ <file alias="string">resources/contents/conversation.png</file> <file alias="bsa">resources/contents/locked-chest.png</file> <file alias="menu">resources/contents/config.png</file> - <file alias="inifile">resources/contents/feather-and-scroll.png</file> - <file alias="modgroup">resources/contents/xedit.png</file> + <file alias="inifile">resources/contents/feather-and-scroll.png</file> + <file alias="modgroup">resources/contents/xedit.png</file> </qresource> <qresource prefix="/qt/etc"> <file>qt.conf</file> |