diff options
author | Jacek Antonelli | 2008-09-21 17:13:40 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-21 17:13:40 -0500 |
commit | fdb0e4c6f6a182ebba7b00d2748e4df613b3c893 (patch) | |
tree | 2333f8d4d5747e4f856b08746d5d6759f2d0991c /linden/indra/lib | |
parent | Merge branch 'VWR-2896' into menu_viewer (diff) | |
parent | VWR-1363: Add "Return Object" to the Tools menu. (diff) | |
download | meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.zip meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.gz meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.bz2 meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.xz |
Merge branch 'VWR-1363' into menu_viewer
Conflicts:
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
Diffstat (limited to 'linden/indra/lib')
0 files changed, 0 insertions, 0 deletions