Ansariel
|
e33d2fad5f
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
|
2024-06-21 19:10:44 +02:00 |
|
Bennett Goble
|
a0b3021bdc
|
Trim trailing whitespace
Start trimming trailing whitespace, but limit the blast radius to a
handful of file types.
|
2024-05-29 08:10:00 -07:00 |
|
Nat Goodspeed
|
e2ba2f9c45
|
Move "team:viewer" label action to labeler.yaml.
This avoids the need for a separate job step.
|
2024-01-12 17:26:46 -05:00 |
|
Bennett Goble
|
e75104b066
|
Add automatic PR labels
|
2022-11-18 07:39:54 -08:00 |