diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-19 16:47:05 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-19 16:47:05 -0400 |
commit | 6691bf637e71f40d1bf12065c7caaf96bd9aaf50 (patch) | |
tree | 554b6fbe0bd754f6fc10ee858a66232773c0fb6c /indra/newview/skins/default/colors.xml | |
parent | c1c087b508813ed0a07693decbab82e1cf3403ed (diff) | |
parent | 2a869d52f189a31c185b93f6425dd3e3dd8e927f (diff) |
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
0 files changed, 0 insertions, 0 deletions