diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
commit | 695c4135ff6fa0c50daa4c84f23096096ffd8a54 (patch) | |
tree | a9b539e3ba588634fc493f2ed5ead21124e306ff /doc | |
parent | af6e665d5c9c9a5ea480389c284839f3945bf786 (diff) | |
parent | b6f0921099b9b2a0a582886ebd6383fa20eac2b0 (diff) |
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 98c606c0be..cf9cc032ae 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -174,6 +174,7 @@ Ansariel Hiller VWR-26150 STORM-1685 STORM-1713 + STORM-1899 Aralara Rajal Ardy Lay STORM-859 @@ -400,6 +401,7 @@ Gaberoonie Zanzibar Ganymedes Costagravas Geenz Spad STORM-1823 + STORM-1900 Gene Frostbite GeneJ Composer Geneko Nemeth @@ -636,6 +638,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1877 STORM-1860 STORM-1852 STORM-1870 @@ -644,6 +647,7 @@ Jonathan Yap STORM-1862 Kadah Coba STORM-1060 + STORM-1843 Jondan Lundquist Josef Munster Josette Windlow @@ -654,6 +658,8 @@ Kage Pixel VWR-11 Kagehi Kohn Kaimen Takahe +Katharine Berry + STORM-1900 Keklily Longfall Ken Lavender Ken March @@ -739,6 +745,7 @@ Marianne McCann Marine Kelley STORM-281 MartinRJ Fayray + STORM-1844 STORM-1845 Matthew Anthony Matthew Dowd @@ -1110,9 +1117,12 @@ Sudane Erato Synystyr Texan Takeda Terrawyng TankMaster Finesmith + OPEN-140 + OPEN-142 STORM-1100 - STORM-1602 STORM-1258 + STORM-1602 + STORM-1868 VWR-26622 VWR-29224 Talamasca @@ -1231,6 +1241,8 @@ Watty Berkson Westley Schridde Westley Streeter Whimsy Winx +Whirly Fizzle + STORM-1895 Whoops Babii VWR-631 VWR-1640 |