summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-03-29 16:55:22 -0700
committerJames Cook <james@lindenlab.com>2010-03-29 16:55:22 -0700
commitecc2c726502448076295254714c0bfa8c0074f25 (patch)
tree6a9434c540f7b5ea7bca326df1a420e4a0a99cc4 /doc
parentd2f9e34598621f1dabad15025417efd6b81dddf0 (diff)
parentac103403160e87bb6b40ac3e032d077a3381da8e (diff)
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2e4d803252..ef9f09bd23 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -17,11 +17,11 @@ Agathos Frascati
CT-317
CT-352
Aimee Trescothick
- VWR-1813
VWR-3321
VWR-3336
VWR-3903
VWR-4083
+ VWR-4106
VWR-6348
VWR-6358
VWR-6360
@@ -42,9 +42,12 @@ Aimee Trescothick
VWR-11100
VWR-11111
VWR-11844
+ VWR-12631
+ VWR-12696
+ VWR-12748
+ VWR-14087
VWR-14267
VWR-14278
- VWR-14087
Alejandro Rosenthal
VWR-1184
Aleric Inglewood