summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-08-26 14:34:50 -0400
committerOz Linden <oz@lindenlab.com>2010-08-26 14:34:50 -0400
commit838c01e87d69a29f39554fbc5fa972ddd3baace1 (patch)
tree7d38ae0017f606ef12416ab8a9ce80dcd966ed77 /doc/contributions.txt
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
parentb2b670d787eaa1789b87a62178c970dfb20c02d2 (diff)
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9df072e937..f451c5732e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -212,6 +212,8 @@ Dzonatas Sol
VWR-1705
VWR-1729
VWR-1812
+Eddi Decosta
+ SNOW-586
Eddy Stryker
VWR-15
VWR-23
@@ -632,6 +634,7 @@ Tharax Ferraris
VWR-605
Thickbrick Sleaford
SNOW-207
+ SNOW-586
SNOW-743
VWR-7109
VWR-9287