phoenix-firestorm/indra/newview/skins/default/xui
Ansariel ecbf70877e Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
2025-09-27 10:55:28 +02:00
..
az Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-09-22 22:52:19 +02:00
da Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-11 23:10:40 +02:00
de Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-27 10:55:28 +02:00
en Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-27 10:55:28 +02:00
es Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-09-22 22:52:19 +02:00
fr Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-09-22 22:52:19 +02:00
it Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-09-22 22:52:19 +02:00
ja Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-27 10:55:28 +02:00
pl Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-27 10:55:28 +02:00
pt Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-16 18:33:02 +02:00
ru Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-09-22 22:52:19 +02:00
tr Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-16 18:33:02 +02:00
zh Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-27 10:55:28 +02:00