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
..
workflows	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-11 20:25:22 +02:00
dependabot.yml	Create dependabot.yml for github-actions	2024-04-03 17:10:03 +01:00
labeler.yaml	Trim trailing whitespace	2024-05-29 08:10:00 -07:00