Mercurial > trustbridge
changeset 1359:c85da02d669e 0.9.4
merge
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 30 Oct 2014 14:51:58 +0100 |
| parents | f93422b8b1a1 (diff) f675f25e2a7b (current diff) |
| children | bb17f55f6cf1 |
| files | |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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