684bc1d1ea
# Conflicts: # autobuild.xml # indra/cmake/00-Common.cmake # indra/llcommon/llsys.cpp # indra/llwindow/llwindow.cpp # indra/llwindow/llwindow.h # indra/llwindow/llwindowmacosx.cpp # indra/llwindow/llwindowmacosx.h # indra/llwindow/llwindowwin32.cpp # indra/llwindow/llwindowwin32.h # indra/newview/app_settings/logcontrol.xml # indra/newview/llappviewerwin32.cpp # indra/newview/llpanelpeople.h # indra/newview/llspeakers.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvocache.cpp # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.h # indra/newview/llvoicevivox.cpp # indra/newview/skins/default/xui/en/panel_preferences_sound.xml # indra/newview/viewer_manifest.py # scripts/messages/message_template.msg.sha1 |
||
|---|---|---|
| .. | ||
| testplans | ||
| LGPL-license.txt | ||
| LICENSE-logos.txt | ||
| LICENSE-source.txt | ||
| building_linux.md | ||
| building_macos.md | ||
| building_windows.md | ||
| contributions.txt | ||
| firestorm_256.png | ||
| translations.txt | ||
