diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
| commit | d82d5c357a98745d265a839dd0242ec8a4994e86 (patch) | |
| tree | ac61ed5c7e676e438a80bedd3f14f41fa7f35975 /indra/newview/skins/default/xui/en/floater_conversation_log.xml | |
| parent | 56101002a460ecd9bb7a264d55b6f8ecb9a348a0 (diff) | |
| parent | bd9add8fc77d7f39cb7c81972f72adbc3e6b5464 (diff) | |
Merge commit 'bd9add8fc7' into marchcat/c-develop
# Conflicts:
# autobuild.xml
# indra/llui/llmodaldialog.cpp
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/tests/llviewerassetstats_test.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_conversation_log.xml')
0 files changed, 0 insertions, 0 deletions