summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-01-12 19:00:36 -0800
committerDon Kjer <don@lindenlab.com>2011-01-12 19:00:36 -0800
commit756a4e26da6cec82d48a71d05b1f43623b56313d (patch)
tree4dfa615e17c7941114679643e1aa5a2875583f29 /doc
parentd8b4363c1d3f60741422419b386b79df23a6da6a (diff)
parent55322713fc071a3e171fd4cfbea989945dc8d084 (diff)
Merge with viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3b14ce5125..f21354b406 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -219,6 +219,8 @@ Catherine Pfeffer
Celierra Darling
VWR-1274
VWR-6975
+Coaldust Numbers
+ VWR-1095
Cron Stardust
VWR-10579
Cypren Christenson
@@ -364,15 +366,17 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
- STORM-596
STORM-523
+ STORM-596
+ STORM-615
STORM-616
STORM-679
- STORM-737
+ STORM-723
STORM-726
+ STORM-737
+ STORM-785
STORM-812
VWR-17801
- STORM-785
Kage Pixel
VWR-11
Ken March