livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/llcommon/llsys.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 		2024-06-21 19:46:51 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
linux_crash_logger
…
llappearance Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-11 20:25:22 +02:00
llaudio Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llcharacter Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llcorehttp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 15:47:42 +02:00
llcrashlogger Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llimage Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llimagej2coj Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llinventory Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llkdu
…
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llmeshoptimizer
…
llmessage Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llplugin Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llprimitive Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-06-13 03:21:12 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llwebrtc Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llxml Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
mac_crash_logger
…
media_plugins
…
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
test Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…