diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-04-10 17:43:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-04-10 17:55:18 +0300 |
| commit | 6c85123a3a38a28d06089901c0b5c08e4782de58 (patch) | |
| tree | e5dea08711ddc1faf4821bae000bd58c9ac6f498 /indra/lib/python | |
| parent | f5908eddc683dd705d334c88377139e39bbfb54f (diff) | |
| parent | 5c500ccf407f0b5a0b253b98dd4bd3f33f643aba (diff) | |
Merge remote-tracking branch 'origin/main' into marchcat/slua-26.1.1
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Python.cmake
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanellogin.cpp
Diffstat (limited to 'indra/lib/python')
| -rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 1bd65eb57d..0ad0b6b1a9 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -157,7 +157,8 @@ BASE_ARGUMENTS=[ for use by a .bat file.""", default=None), dict(name='versionfile', - description="""The name of a file containing the full version number."""), + description="""The name of a file containing the full version number.""", + default=None), ] def usage(arguments, srctree=""): |