Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 ... # Conflicts: # indra/newview/pipeline.cpp		2020-04-20 21:23:34 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-500	2020-04-20 21:23:34 +03:00
releasenotes-where.txt	…
translations.txt	…