diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-03-01 02:59:15 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-03-01 02:59:15 +0200 |
commit | fa9d4927f45f868573d95d670652c561d50a0de7 (patch) | |
tree | 816639620f4308300d8d5b20a9356d43bac0d8f0 /indra/newview/skins/default/xui/pt/floater_im_container.xml | |
parent | 201f83472c604e837b40c12f3750602e30d79d0b (diff) | |
parent | 43031968a653899f62755b6d7b7e28b7fedc24d9 (diff) |
Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/skins/default/xui/pt/floater_im_container.xml')
0 files changed, 0 insertions, 0 deletions