diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:37:49 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:37:49 +0300 |
| commit | 33dc262e9a07c01ed33fb3a28edef32439fc908e (patch) | |
| tree | 6ee5eb01c2a6930905a57a879d5a66df5628bcab /indra/newview/skins/default/colors.xml | |
| parent | 6ce9daa13d87fadc03d9ccd819a3e9b3f8748d8d (diff) | |
| parent | 79b560dcfb33f71da04ecc6c1290e39819ecaf11 (diff) | |
Merge commit '79b560dcfb' into marchcat/c-develop
# Conflicts:
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llhudobject.cpp
# indra/newview/llhudobject.h
# indra/newview/llviewermenu.cpp
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
0 files changed, 0 insertions, 0 deletions