diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:48:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:48:19 +0300 |
| commit | 347126a64412378778cca1de856049fd3070607b (patch) | |
| tree | 1ed214ddb452b273c1f89137f2f85b3260c83c6c /indra/newview/llviewerparcelmgr.h | |
| parent | 2febf90744624120b9d93708792ed5aaedb8ad14 (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
0 files changed, 0 insertions, 0 deletions