Siana Gearz d385de9139 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/newview/llstartup.cpp
	indra/newview/llviewerregion.cpp

2012-01-24 21:22:49 +01:00

..

dictionaries

…

shaders

…

windlight

…

anim.ini

…

ao_template.ini

…

CA.pem

…

client_tags_sg1.xml

…

cmd_line.xml

…

default_grids.xml

…

grass.xml

…

high_graphics.xml

…

keys.ini

…

keywords.ini

…

logcontrol.xml

…

low_graphics.xml

…

mid_graphics.xml

…

mime_types.xml

…

settings_ascent_coa.xml

…

settings_ascent.xml

…

settings_crash_behavior.xml

…

settings_files.xml

…

settings_per_account_ascent.xml

…

settings_per_account.xml

…

settings_rlv.xml

…

settings_sh.xml

…

settings.xml

…

static_data.db2

…

static_index.db2

…

std_bump.ini

…

trees.xml

…

ultra_graphics.xml

…

viewerart.xml

…