livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel ed67ca001c Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 		2023-08-09 11:05:56 +02:00
..
cmake Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-19 10:27:16 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-28 18:16:42 +02:00
llaudio
…
llcharacter Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-19 10:27:16 +02:00
llcommon Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-22 10:36:45 +02:00
llcorehttp Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-19 10:27:16 +02:00
llcrashlogger
…
llfilesystem Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-04 13:07:30 +02:00
llimage
…
llimagej2coj
…
llinventory Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-09 11:05:56 +02:00
llkdu
…
llmath Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-12 09:26:38 +02:00
llmeshoptimizer
…
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-09 10:36:35 +02:00
llplugin
…
llprimitive Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-18 10:59:02 +02:00
llrender Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-19 10:27:16 +02:00
llui Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-28 17:46:21 +02:00
llwindow Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-18 10:59:02 +02:00
llxml Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-19 10:27:16 +02:00
mac_crash_logger
…
media_plugins
…
newview Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-09 11:05:56 +02:00
test
…
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…
fix-incredibuild.py
…