Andrey Lihatskiy 510574dc14 Merge branch 'master' into DRTVWR-501-maint ... # Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp		2020-05-18 23:41:19 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-501-maint	2020-05-18 23:41:19 +03:00
releasenotes-where.txt	…
translations.txt	…