Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix ... # Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp		2021-09-03 00:18:26 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix	2021-09-03 00:18:26 +03:00
releasenotes-where.txt	…
sl-logo.png	SL-14702: Spruce up README	2021-08-02 10:10:14 -07:00
translations.txt	…