diff options
| author | Jacek Antonelli | 2008-09-28 13:56:00 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-28 19:55:41 -0500 |
| commit | 9a4f5702473e7540cde1bbff2d7189d9ed71fd86 (patch) | |
| tree | 53d52a965085be43c89ef45592a8198f7befc4be /linden/doc/contributions.txt | |
| parent | Second Life viewer sources 1.21.2-RC (diff) | |
| parent | Merge branch 'VWR-8341' into next-merge (diff) | |
| download | meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.zip meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.gz meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.bz2 meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.xz | |
Updated to SL source 1.21.2.
Conflicts:
linden/indra/SConstruct
linden/indra/newview/files.lst
linden/indra/newview/llfloatertools.cpp
linden/indra/newview/llfloatertools.h
linden/indra/newview/lloverlaybar.cpp
linden/indra/newview/lloverlaybar.h
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/doc/contributions.txt')
| -rw-r--r-- | linden/doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index ea5ba5d..346aba5 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
| @@ -14,6 +14,8 @@ Adam Marker | |||
| 14 | Aimee Trescothick | 14 | Aimee Trescothick |
| 15 | VWR-3903 | 15 | VWR-3903 |
| 16 | VWR-4083 | 16 | VWR-4083 |
| 17 | VWR-8341 | ||
| 18 | VWR-8430 | ||
| 17 | Alejandro Rosenthal | 19 | Alejandro Rosenthal |
| 18 | VWR-1184 | 20 | VWR-1184 |
| 19 | Alissa Sabre | 21 | Alissa Sabre |