changeset 1280:6e454e24b8af

MErged.
author Emanuel Schuetze <emanuel@intevation.de>
date Mon, 29 Sep 2014 11:43:23 +0200
parents b53434f9280a (current diff) 19c1ce008ba4 (diff)
children 4c200e512f76
files ui/img/trash-empty.png
diffstat 2 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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>
Binary file ui/img/trash-empty.png has changed

http://wald.intevation.org/projects/trustbridge/