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

This commit is contained in:
Gavin Andresen 2012-03-26 15:34:13 -04:00
commit dd675e01c4

View File

@ -75,6 +75,10 @@ Section -Main SEC0000
File /r /x *.exe /x *.o ../src\*.* File /r /x *.exe /x *.o ../src\*.*
SetOutPath $INSTDIR SetOutPath $INSTDIR
WriteRegStr HKCU "${REGKEY}\Components" Main 1 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 SectionEnd
Section -post SEC0001 Section -post SEC0001