diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-25 17:58:11 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-25 17:58:11 -0500 |
| commit | 438ceeb008b7c4eec0fc48894935289ca352fc65 (patch) | |
| tree | c14813597483c0caeafed02e8820458fa9562a03 /indra/newview/lltextureinfo.h | |
| parent | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (diff) | |
BUILDFIX: merge cleanup
A couple of merge issues that caused the resulting code to not build.
Diffstat (limited to 'indra/newview/lltextureinfo.h')
0 files changed, 0 insertions, 0 deletions