livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/newview/skins/default/xui
History
Ansariel 5c03f284af Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/APR.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/newview/llsurface.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/viewer_manifest.py
 		2025-10-18 13:01:08 +02:00
..
az Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
da Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
de Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-18 13:01:08 +02:00
en Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-18 13:01:08 +02:00
es Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
fr Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
it Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
ja Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
pl Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
pt Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
ru Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
tr Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
zh Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00