diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:13 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:13 +0200 |
commit | f271ba32774bae67754cb2c8144549aed9301012 (patch) | |
tree | 3c383647a73fec94bdd2f3b3e2e611bf65cc517c /indra/mac_crash_logger/mac_crash_logger.cpp | |
parent | 003f396d2fc81148a3f30b56a7af38a78744b869 (diff) | |
parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) |
Merge branch 'master' into DRTVWR-514-keymappings
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> |