livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel d7eeaf42ce Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 		2022-09-03 13:53:07 +02:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 21:56:48 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559 2022-08-30 10:46:36 -05:00
llaudio
…
llcharacter
…
llcommon Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-03 13:53:07 +02:00
llcorehttp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 21:56:48 +02:00
llcrashlogger
…
llfilesystem Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 2022-08-30 22:17:59 +02:00
llimage Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 2022-08-30 22:17:59 +02:00
llimagej2coj
…
llinventory Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 09:43:24 +02:00
llkdu
…
llmath Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 09:43:24 +02:00
llmeshoptimizer
…
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 21:56:48 +02:00
llplugin
…
llprimitive Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 09:43:24 +02:00
llrender Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 2022-08-30 22:17:59 +02:00
llui Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 09:03:56 +02:00
llwindow Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 2022-08-30 22:17:59 +02:00
llxml
…
mac_crash_logger
…
media_plugins
…
newview Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-03 13:53:07 +02:00
test Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 21:56:48 +02:00
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…
fix-incredibuild.py
…