diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-29 18:30:05 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-29 18:30:05 +0300 |
| commit | 1b369c7f10c987dcd1c985ccff7b94ff27fbfe12 (patch) | |
| tree | 9c94f15adb7695c647076f9c869b14f4c9b45c50 /indra/newview/skins/default/xui/de/floater_translation_settings.xml | |
| parent | 2c940a1d8015601f5eea628b8940fde0547756d6 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/de/floater_translation_settings.xml')
0 files changed, 0 insertions, 0 deletions