From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 application/resources/backgrounds/backgrounds.qrc |   1 +
 application/resources/backgrounds/catbgrnd2.png   | Bin 78285 -> 62973 bytes
 application/resources/backgrounds/catmas.png      | Bin 0 -> 72818 bytes
 3 files changed, 1 insertion(+)
 create mode 100644 application/resources/backgrounds/catmas.png

(limited to 'application/resources/backgrounds')

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
Binary files a/application/resources/backgrounds/catbgrnd2.png and b/application/resources/backgrounds/catbgrnd2.png differ
diff --git a/application/resources/backgrounds/catmas.png b/application/resources/backgrounds/catmas.png
new file mode 100644
index 00000000..8bdb1d5c
Binary files /dev/null and b/application/resources/backgrounds/catmas.png differ
-- 
cgit v1.2.3