summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-01 11:28:22 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-01 11:28:22 -0500
commitfbc6e5d63970e081d7543f884fcc0fb897fce28e (patch)
treee722e908e0cc1f889be16a4815286172222dac6b /doc/contributions.txt
parent293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (diff)
parentf0074f1002f36ad680ae04daf3f5e026dca31d54 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r--doc/contributions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 18fed00ff8..519df22b93 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -83,6 +83,7 @@ Aleric Inglewood
VWR-24315
VWR-24317
VWR-24320
+ VWR-24321
VWR-24354
VWR-24519
SNOW-84
@@ -385,9 +386,11 @@ Jonathan Yap
STORM-869
STORM-785
STORM-812
+ STORM-829
VWR-17801
VWR-24347
STORM-844
+ STORM-643
Kage Pixel
VWR-11
Ken March
@@ -770,6 +773,7 @@ Twisted Laws
STORM-466
STORM-467
STORM-844
+ STORM-643
Vadim Bigbear
VWR-2681
Vector Hastings