diff options
| author | Jacek Antonelli | 2008-12-13 23:31:47 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-13 23:31:47 -0600 |
| commit | d389594c7cb0f4dad5076f33fb0b41ec4f93606e (patch) | |
| tree | 471a75f6455711c6f4e6ba8ec14fe27ba48d3352 /linden/doc | |
| parent | Version string generator now includes test label. (diff) | |
| parent | Friends dots show as yellow and color can be set in colors.xml (diff) | |
| download | meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.zip meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.gz meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.bz2 meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.xz | |
Merged 'mccabe/VWR-3336' into next
Conflicts:
linden/indra/newview/skins/default/colors_base.xml
linden/indra/newview/skins/silver/colors_base.xml
Diffstat (limited to 'linden/doc')
| -rw-r--r-- | linden/doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 346aba5..48c1429 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
| @@ -13,6 +13,7 @@ Adam Marker | |||
| 13 | VWR-2755 | 13 | VWR-2755 |
| 14 | Aimee Trescothick | 14 | Aimee Trescothick |
| 15 | VWR-3903 | 15 | VWR-3903 |
| 16 | VWR-3336 | ||
| 16 | VWR-4083 | 17 | VWR-4083 |
| 17 | VWR-8341 | 18 | VWR-8341 |
| 18 | VWR-8430 | 19 | VWR-8430 |