summaryrefslogtreecommitdiff
path: root/indra/newview/llkeyconflict.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-06-29 16:36:42 -0400
committerNat Goodspeed <nat@lindenlab.com>2021-06-29 16:36:42 -0400
commitb9bab5952c2ea62a13543f7fa293f59cb063902d (patch)
tree9fe19b3f6f4ce907f427ae73d619d8d76667e763 /indra/newview/llkeyconflict.h
parent467d8339c970c253dada2cf0e1eed45be66593ac (diff)
parent5d32c4272d9e80f3373f12b433895b9b44f6490d (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/llkeyconflict.h')
0 files changed, 0 insertions, 0 deletions