Merge branch 'master' of github.com:bitcoin/bitcoin

2012-03-26 15:34:13 -04:00 · 2012-03-26 15:34:13 -04:00 · dd675e01c4
parent c698633447 be4502968e
commit dd675e01c4
1 changed files with 4 additions and 0 deletions
--- a/share/setup.nsi
+++ b/share/setup.nsi
@ -75,6 +75,10 @@ Section -Main SEC0000
    File /r /x *.exe /x *.o ../src\*.*
    SetOutPath $INSTDIR
    WriteRegStr HKCU "${REGKEY}\Components" Main 1
+
+    # Remove old wxwidgets-based-bitcoin executable and locales:
+    Delete /REBOOTOK $INSTDIR\bitcoin.exe
+    RMDir /r /REBOOTOK $INSTDIR\locale
 SectionEnd

 Section -post SEC0001