[PATCH 2 of 2] Merged

[Wald Commits]

# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1404400102 -7200
# Node ID a26aada5900fbecab1edd119a582005ea164f3fb
# Parent  c92eb6298dd7724ca9021b5781f268aaec351627
# Parent  54ca82647dc53a1e658aadc80fb203af4871a1a8
Merged.

diff -r c92eb6298dd7 -r a26aada5900f ui/icons.qrc
--- a/ui/icons.qrc	Thu Jul 03 16:39:51 2014 +0200
+++ b/ui/icons.qrc	Thu Jul 03 17:08:22 2014 +0200
@@ -2,7 +2,6 @@
 <qresource>
     <file>img/tray_22.png</file>
     <file>img/logo.png</file>
-    <file>img/logo-small.png</file>
     <file>img/list-add.png</file>
     <file>img/list-remove.png</file>
     <file>img/document-save.png</file>
diff -r c92eb6298dd7 -r a26aada5900f ui/img/logo-small.png
Binary file ui/img/logo-small.png has changed