diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:21:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:21:19 +0300 |
| commit | 6ce9daa13d87fadc03d9ccd819a3e9b3f8748d8d (patch) | |
| tree | aca982dba1eed0485bf7153165b30cd4774987aa /indra/newview/llconversationview.h | |
| parent | e8d33a8b5b06b70b6354672b6d426e82a8aed578 (diff) | |
| parent | 15908fd34e6d7a40f1d21e9f83676429818f2f06 (diff) | |
Merge commit '15908fd34e' into marchcat/c-develop
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/llappviewer.cpp
# indra/newview/llconversationlog.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/newview/llconversationview.h')
0 files changed, 0 insertions, 0 deletions