Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint ... # Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py		2020-08-11 01:34:13 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint	2020-08-11 01:34:13 +03:00
releasenotes-where.txt	…
translations.txt	…