diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
| commit | 4666497507b2489004a4ebcf77c0e33723291bcd (patch) | |
| tree | 677050cb13533b17e2c5e170a8438aef221b85ca /indra/llui/llrngwriter.cpp | |
| parent | 11ecd9a2d97f2daeba932bcda557d3ae17956ed8 (diff) | |
| parent | f8ed44f8ec80916e684c2783da02f89474710de6 (diff) | |
merge up to latest changes from callum and nat
Diffstat (limited to 'indra/llui/llrngwriter.cpp')
| -rwxr-xr-x | indra/llui/llrngwriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp index 523bc7c667..e4a31d6a79 100755 --- a/indra/llui/llrngwriter.cpp +++ b/indra/llui/llrngwriter.cpp @@ -34,7 +34,7 @@ #pragma clang diagnostic ignored "-Wdelete-incomplete" #include "lluictrlfactory.h" #pragma clang diagnostic pop -#elif +#else #include "lluictrlfactory.h" #endif |