4dcab10bf8
# Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp |
||
|---|---|---|
| .. | ||
| camera | ||
| filters | ||
| shaders | ||
| windlight | ||
| anim.ini | ||
| autoreplace.xml | ||
| cmd_line.xml | ||
| commands.xml | ||
| foldertypes.xml | ||
| grass.xml | ||
| high_graphics.xml | ||
| ignorable_dialogs.xml | ||
| key_bindings.xml | ||
| keywords.ini | ||
| keywords_lsl_default.xml | ||
| lindenlab.pem | ||
| llsd-lsl-syntax.rng | ||
| llsd.xsd | ||
| logcontrol.xml | ||
| low_graphics.xml | ||
| mid_graphics.xml | ||
| settings.xml | ||
| settings_crash_behavior.xml | ||
| settings_files.xml | ||
| settings_minimal.xml | ||
| settings_per_account.xml | ||
| std_bump.ini | ||
| toolbars.xml | ||
| trees.xml | ||
| ultra_graphics.xml | ||
| viewerart.xml | ||