livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel 210f59a923 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderview.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llstatbar.cpp
#	indra/llui/lltabcontainer.h
#	indra/llwindow/lldxhardware.cpp
#	indra/llwindow/lldxhardware.h
#	indra/llwindow/llkeyboard.cpp
#	indra/llwindow/llkeyboard.h
#	indra/llwindow/llkeyboardheadless.cpp
#	indra/llwindow/llkeyboardheadless.h
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowsdl.cpp
#	indra/llwindow/llwindowsdl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/llavatarlist.cpp
#	indra/newview/llavatarlistitem.h
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llchiclet.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatermap.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltoolcomp.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolpie.cpp
 		2024-02-18 16:22:54 +01:00
..
cmake Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-09 01:42:36 +01:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
linux_crash_logger
…
llappearance Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llaudio Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-13 00:54:24 +01:00
llcharacter Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llcommon Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llcorehttp
…
llcrashlogger Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-09 01:12:52 +01:00
llfilesystem Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llimage Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-13 00:54:24 +01:00
llimagej2coj Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
llinventory Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llkdu Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
llmath Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llmeshoptimizer
…
llmessage Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llplugin Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-13 00:54:24 +01:00
llprimitive Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
llrender Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
llui Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 16:22:54 +01:00
llwindow Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 16:22:54 +01:00
llxml Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 00:09:57 +01:00
mac_crash_logger
…
media_plugins Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
newview Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 16:22:54 +01:00
test Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-18 16:22:54 +01:00
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…
fix-incredibuild.py
…