Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint ... # Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount		2021-12-15 21:16:47 +02:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint	2021-12-15 21:16:47 +02:00
releasenotes-where.txt	…
sl-logo.png	SL-14702: Spruce up README	2021-08-02 10:10:14 -07:00
translations.txt	…