diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 13:51:12 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 13:51:12 -0700 |
| commit | db803e193efee4a54fc0ca3a7fe1a6d4e089c06a (patch) | |
| tree | de7443b566c0a59c950663120dc892e00ac421dd /indra/newview/lltextureinfo.cpp | |
| parent | b3c010ea7130331d454c480b82d1309bac712004 (diff) | |
Merge conflict mixup, use noaction instead of none for user preference
Diffstat (limited to 'indra/newview/lltextureinfo.cpp')
0 files changed, 0 insertions, 0 deletions