summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-09 18:18:00 +0200
committerKali Kaneko <kali@leap.se>2013-08-09 18:18:00 +0200
commite3758f91f58d3a17032860bb17e1643c331c3b0f (patch)
tree7fb9d8e5a675a093443a4224b0fd70c26d437b0c /data
parent275109e17f53c2fceb21d6f87626762800f53e22 (diff)
parentb942468aac94be2bf4bb9bc1849391e72c366697 (diff)
Merge remote-tracking branch 'chiiph/feature/relnotes' into develop
Diffstat (limited to 'data')
-rw-r--r--data/bitmask.pro (renamed from data/leap_client.pro)0
-rw-r--r--data/images/mask-icon.pngbin0 -> 16575 bytes
-rw-r--r--data/images/mask-launcher.pngbin0 -> 37759 bytes
-rw-r--r--data/resources/mainwindow.qrc2
4 files changed, 2 insertions, 0 deletions
diff --git a/data/leap_client.pro b/data/bitmask.pro
index ff26ad1a..ff26ad1a 100644
--- a/data/leap_client.pro
+++ b/data/bitmask.pro
diff --git a/data/images/mask-icon.png b/data/images/mask-icon.png
new file mode 100644
index 00000000..3504bae9
--- /dev/null
+++ b/data/images/mask-icon.png
Binary files differ
diff --git a/data/images/mask-launcher.png b/data/images/mask-launcher.png
new file mode 100644
index 00000000..cb27f8d3
--- /dev/null
+++ b/data/images/mask-launcher.png
Binary files differ
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 655f2812..d1268186 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -1,5 +1,7 @@
<RCC>
<qresource prefix="/">
+ <file>../images/mask-launcher.png</file>
+ <file>../images/mask-icon.png</file>
<file>../images/watermark.png</file>
<file>../images/leap-gray-big.png</file>
<file>../images/Blue-Arrow-Right-32.png</file>