summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-26 10:42:38 -0400
committerKali Kaneko <kali@leap.se>2014-02-26 10:42:38 -0400
commitf0346b77185dc353d6ac65308189fbe236ce2b44 (patch)
treec11b203beb2a8e813945cc4c6dfadc184dd8e6c0 /data
parent3e5e020e1e23f83cffa0a3579f0755401f18a9e7 (diff)
parent6650529db2f001718bb79eab34aee4d4830eb346 (diff)
Merge remote-tracking branch 'ivan-github/feature/add-pastebin-support' into develop
Diffstat (limited to 'data')
-rw-r--r--data/images/pastebin.pngbin0 -> 2078 bytes
-rw-r--r--data/resources/loggerwindow.qrc1
2 files changed, 1 insertions, 0 deletions
diff --git a/data/images/pastebin.png b/data/images/pastebin.png
new file mode 100644
index 00000000..62179840
--- /dev/null
+++ b/data/images/pastebin.png
Binary files differ
diff --git a/data/resources/loggerwindow.qrc b/data/resources/loggerwindow.qrc
index 847ca9a1..a385c50e 100644
--- a/data/resources/loggerwindow.qrc
+++ b/data/resources/loggerwindow.qrc
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
+ <file>../images/pastebin.png</file>
<file>../images/oxygen-icons/edit-bomb.png</file>
<file>../images/oxygen-icons/document-save-as.png</file>
<file>../images/oxygen-icons/dialog-information.png</file>