diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-20 12:51:15 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-20 12:51:15 -0400 |
commit | 4bd450737bf1f5a74a4857932235d7bcbead1388 (patch) | |
tree | 3298ebf4aedad3415961a81073d1ed79c1d374ed /indra/newview/skins/default/xui/pt/panel_side_tray.xml | |
parent | 2961992a7e135ca68e5d78b245ea9a43b4284e56 (diff) | |
parent | b0c700bfa0b94ca9288470d1bae78ce12369d4f5 (diff) |
automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/pt/panel_side_tray.xml')
0 files changed, 0 insertions, 0 deletions