diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 00:54:53 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 00:54:53 +0200 |
commit | f9373a9b4ea6a1e22c69976303b5a15763bd994b (patch) | |
tree | 6982b8a537b201c216efc74566dea9210243292c /indra/newview/llspeakingindicatormanager.h | |
parent | 3614083377a9bc00da057acbd9caaaa95f7a4c2a (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' into DRTVWR-527-maint
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.h')
0 files changed, 0 insertions, 0 deletions