diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
| commit | d6480e2b7f38facd27bf90376aca1c2b3832fa55 (patch) | |
| tree | bd8bd223515cd4ecf74d1efca404af793825f2f2 /indra/newview/llfloaterproperties.cpp | |
| parent | 11a9332fa7bd830d8e44f15a91e008f3a6f9c19d (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
0 files changed, 0 insertions, 0 deletions