phoenix-firestorm/.github
Ansariel 3b902c9f36 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/fix-incredibuild.py
#	indra/newview/CMakeLists.txt
#	indra/newview/llagentbenefits.cpp
#	indra/newview/llgltfmateriallist.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llvocache.h
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/viewer_manifest.py
2024-04-17 10:57:12 +02:00
..
workflows Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 2024-04-17 10:57:12 +02:00
dependabot.yml Create dependabot.yml for github-actions 2024-04-03 17:10:03 +01:00
labeler.yaml Add automatic PR labels 2022-11-18 07:39:54 -08:00