Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Conflicts were from code removed

This commit is contained in:
Esteban Lombeyda 2014-05-08 13:48:25 +02:00
parent d09236a1c4
commit bab09b71a2
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Installation/Windows/Templates/arango-packer-template.nsi
View File

@ -37,7 +37,6 @@ Page instfiles
; The stuff to install ; The stuff to install
Section "" ;No components page, name is not important Section "" ;No components page, name is not important
<<<<<<< HEAD
; Set output path to the installation directory. ; Set output path to the installation directory.
SetOutPath $INSTDIR SetOutPath $INSTDIR
@ -51,13 +50,11 @@ Section "" ;No components page, name is not important
install_files: install_files:
FileClose $0 FileClose $0
; Put file there ; Put file there
=======
; Set output path to the installation directory. ; Set output path to the installation directory.
SetOutPath $INSTDIR SetOutPath $INSTDIR
; Put file there ; Put file there
; !insertmacro InstallLib DLL SHARED NOREBOOT_PROTECTED "exdll.dll" $INSTDIR $TEMP ; !insertmacro InstallLib DLL SHARED NOREBOOT_PROTECTED "exdll.dll" $INSTDIR $TEMP
>>>>>>> 80b8d51a7309d0e40ab44d3032c81e0e81cb4412
file "..\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll" file "..\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll"
file "@INSTALLERNAME@-internal.exe" file "@INSTALLERNAME@-internal.exe"
Rename "$INSTDIR\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll" "$INSTDIR\msvcr120.dll" Rename "$INSTDIR\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll" "$INSTDIR\msvcr120.dll"