summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlain Linden <alain@lindenlab.com>2011-02-18 16:07:58 -0800
committerAlain Linden <alain@lindenlab.com>2011-02-18 16:07:58 -0800
commit69855f9d34cce116ceda1a4e5c914547d68f0cff (patch)
tree8d2cd61dcd3bd49e7b9e669f3919fccd308a964b /indra/newview
parentf086f3543de5c408ae9a8365288b52ec5bd0e6ba (diff)
parentefc572339df531cc149d0ddb8f58a692cd796055 (diff)
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/newview')
0 files changed, 0 insertions, 0 deletions