diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:28:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:28:26 +0300 |
| commit | 4c6ae49c88f58d04ae89ffb444954e12f60e0d52 (patch) | |
| tree | acb8ab3be3052138ea2186d497b0991604ce068e /indra/newview/installers | |
| parent | a97d50548090f181f8156ab41a5e03b3e383c1c8 (diff) | |
| parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) | |
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/newview/installers')
| -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 ed37f541c8..962d6c060c 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
|