Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint ... # Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp		2021-07-20 02:48:05 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-521-maint	2021-07-20 02:48:05 +03:00
releasenotes-where.txt	…
translations.txt	…