Andrey Lihatskiy e0ace0c722 Merge branch 'master' into DRTVWR-570-maint-Q ... # Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h		2022-10-20 22:34:11 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-570-maint-Q	2022-10-20 22:34:11 +03:00
releasenotes-where.txt	…
sl-logo.png	SL-14702: Spruce up README	2021-08-02 10:10:14 -07:00
translations.txt	…