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.qrc | |
| 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.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> |