diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:34:29 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:34:29 +0200 |
| commit | 981cdca0a5f874fb02694ae5bb39c99784762481 (patch) | |
| tree | f7001c629f918e6fff756574128cb068dd25d309 /indra/llmessage/llxfermanager.cpp | |
| parent | f9e7e59405a161828ec5dde624299b8aa67dc5b7 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/llmessage/llxfermanager.cpp')
0 files changed, 0 insertions, 0 deletions