diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:24:03 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:24:03 +0200 |
commit | ab4d4a4817a3c885e5a21bf1d89119dd5bc37c4f (patch) | |
tree | 6fa087eecf4ebd2fb984b3ecb54fd3286c762478 /indra/llcrashlogger/llcrashlock.h | |
parent | 0505c6ebbb9060d215f61884d06f22d64d2aaf6d (diff) | |
parent | 0bffd3d365023fea504b1070480e7b2f72080129 (diff) |
Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
# Conflicts:
# indra/newview/app_settings/settings.xml
Diffstat (limited to 'indra/llcrashlogger/llcrashlock.h')
-rw-r--r-- | indra/llcrashlogger/llcrashlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlock.h b/indra/llcrashlogger/llcrashlock.h index cde183272f..60b060b736 100644 --- a/indra/llcrashlogger/llcrashlock.h +++ b/indra/llcrashlogger/llcrashlock.h @@ -1,5 +1,5 @@ /** - * @file llpidlock.h + * @file llcrashlock.h * @brief Maintainence of disk locking files for crash reporting * * $LicenseInfo:firstyear=2001&license=viewerlgpl$ |