livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel d60a55b211 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llrender.cpp
#	indra/llrender/llrender.h
#	indra/llrender/llrender2dutils.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llbadge.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llstatbar.cpp
#	indra/newview/llbox.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llhudeffectblob.cpp
#	indra/newview/llhudicon.cpp
#	indra/newview/lljoystickbutton.cpp
#	indra/newview/llmanipscale.cpp
#	indra/newview/llmediactrl.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llsnapshotlivepreview.cpp
#	indra/newview/lltoolmorph.cpp
#	indra/newview/llviewerjointattachment.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/pipeline.cpp
 		2024-09-18 19:53:18 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-18 12:16:32 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llaudio
…
llcharacter
…
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-13 18:54:12 +02:00
llcorehttp Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-09 19:48:04 +02:00
llcrashlogger
…
llfilesystem
…
llimage Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-09 19:48:04 +02:00
llimagej2coj
…
llinventory Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-13 18:54:12 +02:00
llkdu
…
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llmeshoptimizer
…
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-13 18:54:12 +02:00
llplugin Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-18 19:53:18 +02:00
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-18 19:53:18 +02:00
llwebrtc
…
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-13 18:54:12 +02:00
llxml
…
mac_crash_logger
…
media_plugins
…
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-18 19:53:18 +02:00
test
…
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…