# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1414677118 -3600
# Node ID c85da02d669e24a7e01dac10a6fb598f90f3d615
# Parent  f93422b8b1a1cb96245ee769ad7fdd39d45efbd1# Parent  f675f25e2a7b2446c77b81090c765ab84d67bef8
merge

diff -r f675f25e2a7b -r c85da02d669e .hgtags
--- a/.hgtags	Thu Oct 30 14:39:58 2014 +0100
+++ b/.hgtags	Thu Oct 30 14:51:58 2014 +0100
@@ -34,3 +34,13 @@
 0000000000000000000000000000000000000000 0.9.4
 0000000000000000000000000000000000000000 0.9.4
 b90df38bb6dcfe0d485cc31456141ee539e36c90 0.9.4
+b90df38bb6dcfe0d485cc31456141ee539e36c90 0.9.4
+0000000000000000000000000000000000000000 0.9.4
+0000000000000000000000000000000000000000 0.9.4
+06bd82b6aeea381d98614d5b13de1f28fe9f430b 0.9.4
+06bd82b6aeea381d98614d5b13de1f28fe9f430b 0.9.4
+0000000000000000000000000000000000000000 0.9.4
+0000000000000000000000000000000000000000 0.9.4
+114d39aed969023cfc0c19a7b195c370b38eb995 0.9.4
+114d39aed969023cfc0c19a7b195c370b38eb995 0.9.4
+0000000000000000000000000000000000000000 0.9.4
diff -r f675f25e2a7b -r c85da02d669e packaging/trustbridge.nsi
--- a/packaging/trustbridge.nsi	Thu Oct 30 14:39:58 2014 +0100
+++ b/packaging/trustbridge.nsi	Thu Oct 30 14:51:58 2014 +0100
@@ -335,6 +335,8 @@
   RmDir "$0\BSI"
   Delete "$INSTDIR\Uninstall.exe"
   RMDir "$INSTDIR"
+  RMDir "$INSTDIR\.." # The instdir is \trustbridge usually \BSI\TrustBridge we delete the parent directory only if it is empty. So no harm
+                      # done if that is not the case.
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder