diff options
| author | Brian Munro <brian.alexander.munro@gmail.com> | 2018-04-13 11:56:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 11:56:36 +0200 |
| commit | bc75009169ecbf378fa90891dc8183a8cb3ef499 (patch) | |
| tree | 221f74cbaeea3750bd705a6a37ff8242e4cef192 /src/resources.qrc | |
| parent | d6aab781ee1d5b927ccf06100e74539a980ee83f (diff) | |
| parent | 8be73d2e3b0af9cb99616d31418a0d9c74aca466 (diff) | |
Merge pull request #294 from Modorganizer2/Develop
Release 2.1.2
Diffstat (limited to 'src/resources.qrc')
| -rw-r--r-- | src/resources.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/resources.qrc b/src/resources.qrc index 618d3cfc..14c8e533 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -72,6 +72,11 @@ <file alias="package">resources/package.png</file> <file alias="instance_switch">resources/switch-instance-icon.png</file> <file alias="open_folder">resources/open-Folder-Icon.png</file> + <file alias="multiply_red">resources/multiply-red.png</file> + <file alias="archive_conflict_loser">resources/archive-conflict-loser.png</file> + <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file> + <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file> + <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file> </qresource> <qresource prefix="/MO/gui/content"> <file alias="plugin">resources/contents/jigsaw-piece.png</file> |