diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-10-23 20:24:06 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-10-23 20:24:06 -0700 |
| commit | f7463ce46d2c40ab9896f0ff1e900ec82d59299e (patch) | |
| tree | 33502c5e8dcdd06f001fdee404749e07fa74fbaa /indra/llcommon/tests/llstring_test.cpp | |
| parent | de71ed13545f60a82466e55196ce84d3627eccd0 (diff) | |
| parent | 918e2b629bd3dadfbe5288c0d72d93bcca1b8cfe (diff) | |
Automated merge with http://bitbucket.org/callum_linden/viewer-tools-update-callum
Diffstat (limited to 'indra/llcommon/tests/llstring_test.cpp')
| -rwxr-xr-x | indra/llcommon/tests/llstring_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp index 93d3968dbf..a7aa347222 100755 --- a/indra/llcommon/tests/llstring_test.cpp +++ b/indra/llcommon/tests/llstring_test.cpp @@ -27,11 +27,11 @@ */ #include "linden_common.h" -#include "../test/lltut.h" #include <boost/assign/list_of.hpp> #include "../llstring.h" -#include "StringVec.h" +#include "StringVec.h" // must come BEFORE lltut.h +#include "../test/lltut.h" using boost::assign::list_of; |