diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
| commit | 98a431bd16e0e06f8f83b93fd232363403c6463b (patch) | |
| tree | 0e0bc8bc1c5ab18fda8ff5ba948c13b530c8a6cf /indra/newview/installers/windows | |
| parent | 69aa02d2e1873970302942487b96d3a6aca119e5 (diff) | |
| parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) | |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/newview/installers/windows')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 7a1196bb34..d8c6831145 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -26,7 +26,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Compiler flags
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Unicode true
SetOverwrite on # Overwrite files
SetCompress auto # Compress if saves space
SetCompressor /solid lzma # Compress whole installer as one block
|