[PATCH 2 of 2] MErged

[Wald Commits]

# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1411983803 -7200
# Node ID 6e454e24b8afdc7e3404f5cc24a2b04ac95ba8f0
# Parent  b53434f9280ad8d76e48cd20a957b666f081ab92
# Parent  19c1ce008ba4ae14b5112ae7c18a93cccb69f530
MErged.

diff -r b53434f9280a -r 6e454e24b8af ui/icons.qrc
--- a/ui/icons.qrc	Mon Sep 29 11:43:05 2014 +0200
+++ b/ui/icons.qrc	Mon Sep 29 11:43:23 2014 +0200
@@ -17,7 +17,6 @@
     <file>img/dialog-information_16px.png</file>
     <file>img/dialog-information_grey_16px.png</file>
     <file>img/application-exit.png</file>
-    <file>img/trash-empty.png</file>
     <file>img/update-list.png</file>
     <file>img/red-circle.png</file>
     <file>img/preferences-network_16.png</file>
diff -r b53434f9280a -r 6e454e24b8af ui/img/trash-empty.png
Binary file ui/img/trash-empty.png has changed