phoenix-firestorm/.github/workflows
Ansariel 33dfa20463 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewerwindow.cpp
2024-02-15 21:41:29 +01:00
..
build.yaml build.yaml: Build shared branches 2024-01-31 13:26:14 -08:00
build_viewer.yml Make windows testbuilds expire properly 2024-02-12 22:26:45 +00:00
cla.yaml Update cla.yaml allowlist to clear spurious errors (#804) 2024-02-15 04:48:45 +02:00
label.yaml Add automatic PR labels 2022-11-18 07:39:54 -08:00
pre-commit.yaml SL-19242: Remove signing and packaging from viewer_manifest.py 2023-10-03 19:02:40 -04:00
stale.yaml Reduce stale time for PRs 2023-02-13 09:10:29 -08:00