livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel 950fa11bcb Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llstatusbar.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_search.xml
 		2025-08-25 11:26:30 +02:00
..
cmake Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-16 13:45:36 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance
…
llaudio
…
llcharacter Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llcorehttp Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-19 19:33:35 +02:00
llcrashlogger
…
llfilesystem
…
llimage Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llimagej2coj Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llinventory Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-06 19:07:19 +02:00
llkdu Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llmath Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llmeshoptimizer
…
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-25 11:26:30 +02:00
llplugin
…
llprimitive Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-12 22:50:51 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-19 19:16:16 +02:00
llwebrtc Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llwindow Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llxml Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
mac_crash_logger
…
media_plugins
…
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-25 11:26:30 +02:00
test
…
tools/manifests Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-16 12:38:56 +02:00
viewer_components
…
win_crash_logger Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-16 12:38:56 +02:00
CMakeLists.txt
…
Version
…