summaryrefslogtreecommitdiffstats
path: root/application/resources/backgrounds
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
committerThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
commit32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch)
tree7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /application/resources/backgrounds
parent5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff)
downloadMultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip
merged from 0.6.7 codebase
Diffstat (limited to 'application/resources/backgrounds')
-rw-r--r--application/resources/backgrounds/backgrounds.qrc1
-rw-r--r--application/resources/backgrounds/catbgrnd2.pngbin78285 -> 62973 bytes
-rw-r--r--application/resources/backgrounds/catmas.pngbin0 -> 72818 bytes
3 files changed, 1 insertions, 0 deletions
diff --git a/application/resources/backgrounds/backgrounds.qrc b/application/resources/backgrounds/backgrounds.qrc
index 55de139e..83505635 100644
--- a/application/resources/backgrounds/backgrounds.qrc
+++ b/application/resources/backgrounds/backgrounds.qrc
@@ -2,5 +2,6 @@
<RCC version="1.0">
<qresource prefix="/backgrounds">
<file alias="kitteh">catbgrnd2.png</file>
+ <file alias="catmas">catmas.png</file>
</qresource>
</RCC>
diff --git a/application/resources/backgrounds/catbgrnd2.png b/application/resources/backgrounds/catbgrnd2.png
index 2b949e0b..e9de7f27 100644
--- a/application/resources/backgrounds/catbgrnd2.png
+++ b/application/resources/backgrounds/catbgrnd2.png
Binary files differ
diff --git a/application/resources/backgrounds/catmas.png b/application/resources/backgrounds/catmas.png
new file mode 100644
index 00000000..8bdb1d5c
--- /dev/null
+++ b/application/resources/backgrounds/catmas.png
Binary files differ