diff options
| author | Jacek Antonelli | 2009-09-09 11:38:26 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-09 11:59:42 -0500 |
| commit | ced5a5f6a0e7d294f9e477409387674fcecc532c (patch) | |
| tree | e7500de0806009c2955bef6af7103ac60ae1e8e0 /linden/doc/contributions.txt | |
| parent | Merge branch 'objectbackup' into next (diff) | |
| parent | Commented out permissions button (todo: backport this if there's time) (diff) | |
| download | meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.zip meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.gz meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.bz2 meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Moved "Backup" pie menu item to fit "Go Here" in top-left slot.
Conflicts:
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Diffstat (limited to 'linden/doc/contributions.txt')
| -rw-r--r-- | linden/doc/contributions.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 9886640..a1c8624 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
| @@ -61,11 +61,14 @@ Alissa Sabre | |||
| 61 | VWR-7168 | 61 | VWR-7168 |
| 62 | VWR-7087 | 62 | VWR-7087 |
| 63 | VWR-7086 | 63 | VWR-7086 |
| 64 | VWR-9190 | ||
| 64 | VWR-10728 | 65 | VWR-10728 |
| 65 | Angus Boyd | 66 | Angus Boyd |
| 66 | VWR-592 | 67 | VWR-592 |
| 67 | Argent Stonecutter | 68 | Argent Stonecutter |
| 68 | VWR-68 | 69 | VWR-68 |
| 70 | Armin Weatherwax | ||
| 71 | VWR-8436 | ||
| 69 | Asuka Neely | 72 | Asuka Neely |
| 70 | VWR-3434 | 73 | VWR-3434 |
| 71 | Balp Allen | 74 | Balp Allen |