diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 15:11:15 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 15:11:15 -0700 |
| commit | 10241c5596402a145e4087c36014d84507183c32 (patch) | |
| tree | 229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/mac_crash_logger/mac_crash_logger.cpp | |
| parent | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' v6.4.15 into DRTVWR-528
Diffstat (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp')
| -rw-r--r-- | indra/mac_crash_logger/mac_crash_logger.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 54e41a1954..66d8cfa590 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -27,7 +27,6 @@ #include "linden_common.h" #include "llcrashloggermac.h" #include "indra_constants.h" -#include "llpidlock.h" #include <iostream> |