summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/static_data.db2
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-11-04 14:44:00 -0400
committerLoren Shih <seraph@lindenlab.com>2010-11-04 14:44:00 -0400
commit889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (patch)
tree0132d441993d7b26fb67e061f0c2ad50033fde8b /indra/newview/app_settings/static_data.db2
parente2714252f34b02ee628fb1665dfa90b932fab2f7 (diff)
parent3bbaac0b9d246939a2255ca8b06abf9568694370 (diff)
automated merge from http://hg.secondlife.com/viewer-beta
Diffstat (limited to 'indra/newview/app_settings/static_data.db2')
0 files changed, 0 insertions, 0 deletions