diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2008-09-11 16:32:58 +0000 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2008-09-11 16:32:58 +0000 |
| commit | 642cdd95726755b7c24c7f2b25e2fea8e49b5b9b (patch) | |
| tree | b95df24600bb6651f037adc68ca439006dac80f4 /indra/newview/skins/default/xui/ja/floater_camera.xml | |
| parent | cfde9d568e3a4ded1d91dc3188dbf44f3fa0fce9 (diff) | |
svn merge -r96049:96026 -r95956:95931 -r95867:95775 svn+ssh://svn/svn/linden/release
Reverting my changes to the package target. It subtly broke the windows build in a way I didn't want to try to fix in release. Will fix in another branch.
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_camera.xml')
0 files changed, 0 insertions, 0 deletions