livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel 2ba4a164e2 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Python.cmake
#	indra/lib/python/indra/util/llmanifest.py
#	indra/lib/python/indra/util/test_win32_manifest.py
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lleventnotifier.cpp
#	indra/newview/llpanellandmarks.cpp
#	indra/newview/llpreviewanim.cpp
#	indra/newview/llpreviewanim.h
#	indra/newview/llviewerregion.cpp
#	indra/newview/skins/default/xui/de/menu_place_add_button.xml
#	indra/newview/skins/default/xui/it/menu_place_add_button.xml
#	indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ja/menu_place_add_button.xml
#	indra/newview/skins/default/xui/pl/menu_place_add_button.xml
#	indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ru/menu_place_add_button.xml
#	indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
#	indra/newview/viewer_manifest.py
 		2021-12-16 12:32:34 +01:00
..
cmake Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
copy_win_scripts Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
doxygen
…
integration_tests
…
lib/python/indra Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
linux_crash_logger
…
llappearance Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llaudio Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llcharacter Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llcommon Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
llcorehttp Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
llcrashlogger Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 08:22:59 +01:00
llfilesystem Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 08:22:59 +01:00
llimage Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
llimagej2coj
…
llinventory Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 2021-12-15 21:16:47 +02:00
llkdu
…
llmath Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
llmessage Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
llplugin Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-519 2021-11-16 13:04:22 +01:00
llprimitive Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01:00
llrender
…
llui Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 10:20:56 +01:00
llwindow FIRE-11512 - Fix accelerator keys sometimes typing things into text entry fields on Linux 2021-12-15 20:45:49 +01:00
llxml
…
mac_crash_logger
…
media_plugins Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 10:20:56 +01:00
newview Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
test Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
tools
…
viewer_components Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…
fix-incredibuild.py Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 12:32:34 +01:00