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 | |
| parent | d6aab781ee1d5b927ccf06100e74539a980ee83f (diff) | |
| parent | 8be73d2e3b0af9cb99616d31418a0d9c74aca466 (diff) | |
Merge pull request #294 from Modorganizer2/Develop
Release 2.1.2
Diffstat (limited to 'src/resources')
21 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..561e8be8 --- /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..df20532c --- /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..5bedd9c4 --- /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..5cc568c8 --- /dev/null +++ b/src/resources/archive-conflict-winner.png diff --git a/src/resources/check.png b/src/resources/check.png Binary files differindex 0f294a02..5df44755 100644 --- a/src/resources/check.png +++ b/src/resources/check.png diff --git a/src/resources/contents/breastplate.png b/src/resources/contents/breastplate.png Binary files differindex d3d39407..f8c787e2 100644 --- a/src/resources/contents/breastplate.png +++ b/src/resources/contents/breastplate.png diff --git a/src/resources/contents/checkbox-tree.png b/src/resources/contents/checkbox-tree.png Binary files differindex a44dd5fd..f4a63237 100644 --- a/src/resources/contents/checkbox-tree.png +++ b/src/resources/contents/checkbox-tree.png diff --git a/src/resources/contents/config.png b/src/resources/contents/config.png Binary files differindex 3896d885..3aaa2e5c 100644 --- a/src/resources/contents/config.png +++ b/src/resources/contents/config.png diff --git a/src/resources/contents/conversation.png b/src/resources/contents/conversation.png Binary files differindex 11030fff..76286e33 100644 --- a/src/resources/contents/conversation.png +++ b/src/resources/contents/conversation.png diff --git a/src/resources/contents/double-quaver.png b/src/resources/contents/double-quaver.png Binary files differindex 7102f472..21dcf4c1 100644 --- a/src/resources/contents/double-quaver.png +++ b/src/resources/contents/double-quaver.png diff --git a/src/resources/contents/empty-chessboard.png b/src/resources/contents/empty-chessboard.png Binary files differindex b5983010..fccb3aa5 100644 --- a/src/resources/contents/empty-chessboard.png +++ b/src/resources/contents/empty-chessboard.png diff --git a/src/resources/contents/hand-of-god.png b/src/resources/contents/hand-of-god.png Binary files differindex e3a05335..7cbd0102 100644 --- a/src/resources/contents/hand-of-god.png +++ b/src/resources/contents/hand-of-god.png diff --git a/src/resources/contents/jigsaw-piece.png b/src/resources/contents/jigsaw-piece.png Binary files differindex 0b26d56b..4949be40 100644 --- a/src/resources/contents/jigsaw-piece.png +++ b/src/resources/contents/jigsaw-piece.png diff --git a/src/resources/contents/locked-chest.png b/src/resources/contents/locked-chest.png Binary files differindex d70d448e..b49e1165 100644 --- a/src/resources/contents/locked-chest.png +++ b/src/resources/contents/locked-chest.png diff --git a/src/resources/contents/lyre.png b/src/resources/contents/lyre.png Binary files differindex 041dbb01..3adff24e 100644 --- a/src/resources/contents/lyre.png +++ b/src/resources/contents/lyre.png diff --git a/src/resources/contents/tinker.png b/src/resources/contents/tinker.png Binary files differindex 9709cee8..dceb1367 100644 --- a/src/resources/contents/tinker.png +++ b/src/resources/contents/tinker.png diff --git a/src/resources/contents/usable.png b/src/resources/contents/usable.png Binary files differindex 2bc93a7d..c705997a 100644 --- a/src/resources/contents/usable.png +++ b/src/resources/contents/usable.png diff --git a/src/resources/document-save.png b/src/resources/document-save.png Binary files differindex a94e0eab..18e1f974 100644 --- a/src/resources/document-save.png +++ b/src/resources/document-save.png diff --git a/src/resources/multiply-red.png b/src/resources/multiply-red.png Binary files differnew file mode 100644 index 00000000..f35adc74 --- /dev/null +++ b/src/resources/multiply-red.png diff --git a/src/resources/open-Folder-Icon.png b/src/resources/open-Folder-Icon.png Binary files differindex 345671f7..6218ed39 100644 --- a/src/resources/open-Folder-Icon.png +++ b/src/resources/open-Folder-Icon.png diff --git a/src/resources/switch-instance-icon.png b/src/resources/switch-instance-icon.png Binary files differindex b992babe..cd509d3d 100644 --- a/src/resources/switch-instance-icon.png +++ b/src/resources/switch-instance-icon.png |
