diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-02 22:45:42 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-02 22:55:55 +0200 |
| commit | 98d96f0dea03d96b5be2947d05cd3cb55950afc6 (patch) | |
| tree | 41b1e71182f6cbdcefcc6cf8c0ca979113e25c9e /indra/newview/llfloaterpreference.h | |
| parent | 5c5a1973a137c05b8b25498158e36adc6dcf2717 (diff) | |
Manually resolving conflicts after merge with DRTVWR-520
This reverts commit 0a745b47880fb16b1db8cd3327377a383dbfe6a8.
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
0 files changed, 0 insertions, 0 deletions