Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp		2021-04-29 21:00:25 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	merge buildcleanup	2015-06-25 12:13:10 -04:00
LICENSE-source.txt	merge buildcleanup	2015-06-25 12:13:10 -04:00
contributions.txt	Merge master (DRTVWR-515) into DRTVWR-516-maint	2021-04-29 21:00:25 +03:00
releasenotes-where.txt	…
translations.txt	…