diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 16:36:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 16:36:42 -0400 |
| commit | b9bab5952c2ea62a13543f7fa293f59cb063902d (patch) | |
| tree | 9fe19b3f6f4ce907f427ae73d619d8d76667e763 /indra/newview/licenses-mac.txt | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
| parent | 5d32c4272d9e80f3373f12b433895b9b44f6490d (diff) | |
SL-15500: Merge branch 'utf8' into build-hooks
Since we're going to run the git-hooks validation over the whole repository at
the start of every viewer build, it's important that we start with a clean
pass. Certain text files contained non-ASCII, non-UTF8 characters. We had
already been down the path of identifying and replacing those with ASCII. Pull
in those changes.
Diffstat (limited to 'indra/newview/licenses-mac.txt')
| -rw-r--r-- | indra/newview/licenses-mac.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/licenses-mac.txt b/indra/newview/licenses-mac.txt index af80bff5d9..d0747ccd03 100644 --- a/indra/newview/licenses-mac.txt +++ b/indra/newview/licenses-mac.txt @@ -522,7 +522,7 @@ Vivox SDK License RSA Data Security, Inc. MD5 Message-Digest Algorithm -Audio coding: Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C) +Audio coding: Polycom(R) Siren14TM (ITU-T Rec. G.722.1 Annex C) Open Source Software Licensing Each open source software component utilized by this product is subject to its own copyright and licensing terms, as listed below. |