diff options
| author | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
| commit | f1539b727946956826c7c5fb0188b7770cfbdc24 (patch) | |
| tree | 8f6371c2d631f5ad26bd3a9c852fa92edee3b090 /indra/llrender | |
| parent | 5525257b8580df3dbc9860370564e19c9d6cbbaa (diff) | |
| parent | 21b7de56ad6c1efd81ad4406aba1428633b9356e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llrender')
| -rw-r--r--[-rwxr-xr-x] | indra/llrender/llimagegl.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llrender/llimagegl.h | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 751309af20..751309af20 100755..100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 11555e20c4..11555e20c4 100755..100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h |