Ansariel d99fbffb6d Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/newview/gltf/asset.cpp # indra/newview/lldynamictexture.cpp # indra/newview/lltexturectrl.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvovolume.cpp		2024-06-11 20:25:22 +02:00
..
build.yaml	Try to get sign-and-package-windows job a runner to run on	2024-06-10 16:11:29 -07:00
build_viewer.yml	check trigger properly	2024-05-17 12:09:54 +01:00
cla.yaml	https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml	2024-04-16 12:19:09 -04:00
label.yaml	Bump actions/labeler from 4 to 5	2024-04-03 16:11:02 +00:00
pre-commit.yaml	Bump actions/setup-python from 4 to 5	2024-04-03 16:14:34 +00:00
stale.yaml	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-10 21:53:31 +02:00