diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-05-12 13:56:19 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-05-12 13:56:19 -0400 |
commit | fd1545197ac5ea1cc248aa98220c5d078c9555ee (patch) | |
tree | 819b9ffac9d400ede46c8818eb0ff776e26f10f9 /indra/newview/skins/default/xui/zh/menu_conversation.xml | |
parent | 91c20363eee4e1e02435e0ee74867cdb3f6c7136 (diff) | |
parent | 6007475c87d3edbb023cc64bb097d33e6c04dfd4 (diff) |
SL-10297: Merge branch 'sl-10297-oz' into sl-10297.
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few
other miscellaneous goodies.
Diffstat (limited to 'indra/newview/skins/default/xui/zh/menu_conversation.xml')
0 files changed, 0 insertions, 0 deletions