Files
Ansariel 54b7bd3685 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Boost.cmake
#	indra/llxml/llcontrol.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/lleventpoll.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/strings.xml
#	indra/newview/viewer_manifest.py
2026-01-19 10:50:32 +01:00
..
2025-09-05 19:00:05 +03:00