394c8e17d5
# Conflicts: # indra/llrender/llfontfreetype.cpp # indra/llui/llfloater.cpp # indra/llui/llfloater.h # indra/llui/lltextbase.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llinventorygallery.cpp # indra/newview/llworldmapview.cpp # indra/newview/skins/default/xui/en/floater_emoji_picker.xml |
||
|---|---|---|
| .. | ||
| cmake | ||
| copy_win_scripts | ||
| doxygen | ||
| integration_tests | ||
| lib/python/indra | ||
| linux_crash_logger | ||
| llappearance | ||
| llaudio | ||
| llcharacter | ||
| llcommon | ||
| llcorehttp | ||
| llcrashlogger | ||
| llfilesystem | ||
| llimage | ||
| llimagej2coj | ||
| llinventory | ||
| llkdu | ||
| llmath | ||
| llmeshoptimizer | ||
| llmessage | ||
| llplugin | ||
| llprimitive | ||
| llrender | ||
| llui | ||
| llwindow | ||
| llxml | ||
| mac_crash_logger | ||
| media_plugins | ||
| newview | ||
| test | ||
| tools | ||
| viewer_components | ||
| win_crash_logger | ||
| CMakeLists.txt | ||
| Version | ||
| edit-me-to-trigger-new-build.txt | ||
| fix-incredibuild.py | ||