phoenix-firestorm/indra/newview/icons
Ansariel 23416bed5e Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/icons/release/secondlife.icns
#	indra/newview/llstartup.cpp
2025-05-23 12:09:47 +02:00
..
beta
beta-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00
development
development-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00
nightly
nightly-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00
private
private-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00
project
project-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00
release Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-05-23 12:09:47 +02:00
release-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00
test
test-os FIRE-30498: More OpenSim icon fixing 2020-12-01 00:21:39 +01:00