livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel c203bb650a Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 		2024-05-23 01:48:45 +02:00
..
cmake Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-05-08 05:10:22 +02:00
llaudio Merge branch 'main' into marchcat/a-merge 2024-04-24 19:28:15 +03:00
llcharacter Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-05-08 05:10:22 +02:00
llcommon Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
llcorehttp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-24 18:59:46 +02:00
llcrashlogger Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-05-08 05:10:22 +02:00
llfilesystem Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
llimage Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-10 14:12:41 +02:00
llimagej2coj
…
llinventory Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
llkdu Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-24 18:59:46 +02:00
llmath Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
llmeshoptimizer
…
llmessage Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-10 14:12:41 +02:00
llplugin Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-10 14:12:41 +02:00
llprimitive Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
llrender Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-14 23:05:59 +02:00
llui Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
llwindow Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-05-08 05:10:22 +02:00
llxml Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-14 23:05:59 +02:00
mac_crash_logger
…
media_plugins Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-10 12:32:32 +02:00
newview Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
test Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-24 18:59:46 +02:00
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…