summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-14 12:03:14 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-14 12:03:14 -0400
commit13705596af001078d185dfe5aa7e98d9642f8c8a (patch)
tree7731814de2a2d988ba1c4ce2031b4a7f663f28b4 /doc
parent8903578344987432cebc46d889b94574bc005007 (diff)
parentb7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7231bf4da0..337a3da6b8 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -84,10 +84,12 @@ Aleric Inglewood
VWR-24315
VWR-24317
VWR-24320
- VWR-24321
+ VWR-24321
+ VWR-24337
VWR-24354
VWR-24366
VWR-24519
+ VWR-24520
SNOW-84
SNOW-477
SNOW-744
@@ -238,6 +240,7 @@ Coaldust Numbers
VWR-1095
Cron Stardust
VWR-10579
+ VWR-25120
Cypren Christenson
STORM-417
Dale Glass
@@ -407,7 +410,9 @@ Jonathan Yap
STORM-1040
VWR-17801
VWR-24347
+ STORM-975
STORM-990
+ STORM-1020
Kage Pixel
VWR-11
Ken March
@@ -424,6 +429,7 @@ Kitty Barnett
STORM-288
STORM-799
STORM-800
+ STORM-1001
VWR-24217
Kunnis Basiat
VWR-82