diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-01 21:34:44 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-01 21:34:44 +0300 |
| commit | 4c889f7e5252d8c82b0ffc3e13af5bf5d32a6047 (patch) | |
| tree | 7cd047318bfd924ee2381409841f01d9284aca46 /indra/llcommon/llsd.h | |
| parent | 6dbde938e2c72259e941b10fe0a96ba196c95de9 (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' (DRTVWR-514) into DRTVWR-518-ui
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
Diffstat (limited to 'indra/llcommon/llsd.h')
0 files changed, 0 insertions, 0 deletions