diff options
author | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
commit | c6c7c7c71da48b60557dbc4b653398dd6343b6fc (patch) | |
tree | 6711858f93cb0353d44568c4531ba8392990cea2 /indra/test/test.cpp | |
parent | 07185d300d7879fc4d8d268210fa2c440efe02f4 (diff) | |
parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/test/test.cpp')
-rw-r--r-- | indra/test/test.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp index e42374d56b..630af2b73b 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -34,6 +34,7 @@ * */ + #include "linden_common.h" #include "llerrorcontrol.h" #include "lltut.h" @@ -684,4 +685,5 @@ int main(int argc, char **argv) return retval; //delete mycallback; + } |