diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
| commit | e70fe3a50d43bd5276f80c9f82fcfb2de02109cb (patch) | |
| tree | c35ab61e94d7b93e0e8be63f60c439d3b6a8c4b9 /indra/newview/skins/default/xui/pl/panel_edit_socks.xml | |
| parent | 15861d8dec096de57b0b51fa55a61a199a0f4337 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/pl/panel_edit_socks.xml')
0 files changed, 0 insertions, 0 deletions