Andrey Lihatskiy 35708568d6 Merge branch 'master' into DRTVWR-507-maint ... # Conflicts: # indra/newview/llfloatermodelpreview.cpp		2020-10-14 21:58:43 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-507-maint	2020-10-14 21:58:43 +03:00
releasenotes-where.txt	…
translations.txt	…