livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel a944a7b54a Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llui/llemojihelper.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
 		2024-08-02 15:39:34 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-02 15:39:34 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance
…
llaudio Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
llcharacter Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-02 13:01:06 +02:00
llcorehttp Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
llcrashlogger
…
llfilesystem
…
llimage
…
llimagej2coj
…
llinventory
…
llkdu
…
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
llmeshoptimizer
…
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
llplugin
…
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-02 15:39:34 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-26 14:28:51 +02:00
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-02 15:39:34 +02:00
llwebrtc Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-02 13:01:06 +02:00
llwindow Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus 2024-07-30 10:45:11 +02:00
llxml Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
mac_crash_logger
…
media_plugins
…
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-02 15:39:34 +02:00
test Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-30 12:32:41 +02:00
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…