summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-10 10:44:21 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-10 10:44:21 -0500
commite3ed1565f8c6eeff5d87f862465038aa98576fa9 (patch)
tree4ab57c1658d589d802f1e6bb6ff3331b75b61074 /doc/contributions.txt
parent952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (diff)
parent76cb9a7796ffce930458aae00147f8dafa4b33fb (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r--doc/contributions.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8d58cdf60d..1b08b91baf 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -66,6 +66,7 @@ Aleric Inglewood
SNOW-626
SNOW-756
SNOW-764
+ SNOW-800
VWR-10001
VWR-10579
VWR-10759
@@ -91,11 +92,14 @@ Aleric Inglewood
SNOW-744
SNOW-766
STORM-163
+ STORM-955
+ STORM-960
Ales Beaumont
VWR-9352
SNOW-240
Alexandrea Fride
STORM-255
+ STORM-960
Alissa Sabre
VWR-81
VWR-83
@@ -392,6 +396,10 @@ Jonathan Yap
STORM-869
VWR-17801
VWR-24347
+ STORM-844
+ STORM-643
+ STORM-960
+ STORM-953
Kage Pixel
VWR-11
Ken March
@@ -619,6 +627,7 @@ Robin Cornelius
SNOW-599
SNOW-747
STORM-422
+ STORM-960
VWR-2488
VWR-9557
VWR-10579
@@ -667,6 +676,8 @@ Sergen Davies
CT-321
Shawn Kaufmat
SNOW-240
+Siana Gearz
+ STORM-960
SignpostMarv Martin
VWR-153
VWR-154