diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
commit | 7bb74afb67770fb8a02543a5e3a02a9b6d65bc57 (patch) | |
tree | d12b00a2308b0fe000b2eaeb3529b31eeb0c2762 /doc | |
parent | a351c5005eebb03a03f0e79d2efcc5a304fab481 (diff) | |
parent | 41484c19eeb534330a17aff7e7b6663b86198cfe (diff) |
Automated merge with ssh://bitbucket.org/merov_linden/viewer-development-storm-137
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d179c0fb8c..bcf714b29a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -62,6 +62,7 @@ Alejandro Rosenthal VWR-1184 Aleric Inglewood SNOW-522 + SNOW-756 SNOW-764 VWR-10001 VWR-10759 @@ -549,11 +550,13 @@ Ringo Tuxing Robin Cornelius SNOW-108 SNOW-204 + SNOW-287 SNOW-484 SNOW-504 SNOW-506 SNOW-507 SNOW-511 + SNOW-512 SNOW-514 SNOW-520 SNOW-585 @@ -660,6 +663,8 @@ Techwolf Lupindo SNOW-592 SNOW-649 SNOW-650 + SNOW-651 + SNOW-654 SNOW-687 SNOW-680 SNOW-681 @@ -667,6 +672,7 @@ Techwolf Lupindo SNOW-690 SNOW-746 VWR-12385 + VWR-20893 tenebrous pau VWR-247 Tharax Ferraris |