diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:33:53 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:33:53 +0200 |
| commit | caa780fd3a752377f86f7928c8b374951cbe3783 (patch) | |
| tree | 1d3da4ad7cf60d18126fd4519e2ee4d2cd82556b /scripts/messages/message_template.msg.sha1 | |
| parent | b10f0bbd46e5119521a7b560db4a7bfa339276dc (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llvoicevivox.cpp
Diffstat (limited to 'scripts/messages/message_template.msg.sha1')
| -rwxr-xr-x | scripts/messages/message_template.msg.sha1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index bf45b08f93..4712a03e8d 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -be964beb7a2cd060a438c89fd5cb25e2f687d45e
\ No newline at end of file +dddb11f7e45f1779ff536819f36a20e63d572ba8
\ No newline at end of file |