From 2adb61249ec1a084c09ec0aa9e8297126aa4871c Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 31 Oct 2012 16:36:31 +0000 Subject: + resolved conflicts + simplified Error Dialog + Change emblem config git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12683 3a0b52a2-8410-0410-bc02-ff6273a87459 --- trunk/pdf-over-gui/src/main/resources/icons/delete_me | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 trunk/pdf-over-gui/src/main/resources/icons/delete_me (limited to 'trunk/pdf-over-gui/src/main/resources/icons') diff --git a/trunk/pdf-over-gui/src/main/resources/icons/delete_me b/trunk/pdf-over-gui/src/main/resources/icons/delete_me deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3