aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-03-26 15:34:13 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-03-26 15:34:13 -0400
commitdd675e01c482f96f1d403691d8f8fa8773081a9b (patch)
tree09af404e167a089b4a603cf379c376e60c180f1a
parentc698633447b95cd69113676a5cc4d554ba408e14 (diff)
parentbe4502968e18a121331c0fd90cffc4580ff024f3 (diff)
Merge branch 'master' of github.com:bitcoin/bitcoin
-rw-r--r--share/setup.nsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/share/setup.nsi b/share/setup.nsi
index bffef9c413..3d528ce789 100644
--- 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