summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-21 10:36:29 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-21 10:36:29 -0500
commit38f4bad925214d848eccd2b5e32123afeb68984d (patch)
treea1a21acac904ebfc5e80db226ab587af2d6558f7 /doc
parenteac9c45cdad9c96e621f5c84ce51062f40c09511 (diff)
parentbb3be2c07f492577254ae9ace5675eb92d10f061 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8b040d333e..4c59e703ee 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -72,6 +72,7 @@ Aleric Inglewood
VWR-10837
VWR-12691
VWR-12984
+ VWR-13040
VWR-13996
VWR-14426
VWR-24247
@@ -79,6 +80,9 @@ Aleric Inglewood
VWR-24252
VWR-24254
VWR-24261
+ VWR-24315
+ VWR-24317
+ VWR-24320
SNOW-84
SNOW-477
SNOW-744
@@ -395,6 +399,7 @@ Kitty Barnett
STORM-288
STORM-799
STORM-800
+ VWR-24217
Kunnis Basiat
VWR-82
VWR-102
@@ -738,6 +743,7 @@ Thickbrick Sleaford
VWR-9287
VWR-13483
VWR-13947
+ VWR-24420
Thraxis Epsilon
SVC-371
VWR-383