diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-03-02 14:49:34 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-03-02 14:49:34 -0800 |
commit | 3b02f547142b1907369284cb07f275228eeec77b (patch) | |
tree | b2152323a43823a75ea6c5a980b36977d1827b9f /indra/mac_crash_logger/mac_crash_logger.cpp | |
parent | 2aea7cfc25d42e3d87db4fb759baa4419ec23dca (diff) | |
parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) |
Merge branch 'master' into DRTVWR-531
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> |