diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
| commit | f8ed44f8ec80916e684c2783da02f89474710de6 (patch) | |
| tree | 2a4ca145439751e864beb6be91cde52a7901b036 /indra/llkdu | |
| parent | 11ab03331f5028455a56245fc9121b82068565cc (diff) | |
| parent | 0d71baba74e2009e88471e2c44e78863b34a5817 (diff) | |
merge latest updates from nat and callum
Diffstat (limited to 'indra/llkdu')
| -rwxr-xr-x | indra/llkdu/tests/llimagej2ckdu_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 1c9969a5df..dd20ac295d 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -34,7 +34,7 @@ #pragma clang diagnostic ignored "-Wunused-private-field" #include "llkdumem.h" #pragma clang diagnostic pop -#elif +#else #include "llkdumem.h" #endif |