summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-09-08 18:56:43 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-09-08 18:56:43 -0400
commit4091e47cf206a41cac7ee440b8fd2e2898006685 (patch)
tree61de24d7aa90171a5fb6481189567fe408d03786 /doc
parent81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff)
parent09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff)
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt14
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index df504e4a8a..e20b7b83c5 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -174,6 +174,7 @@ Ansariel Hiller
VWR-26150
STORM-1685
STORM-1713
+ STORM-1899
Aralara Rajal
Ardy Lay
STORM-859
@@ -400,6 +401,7 @@ Gaberoonie Zanzibar
Ganymedes Costagravas
Geenz Spad
STORM-1823
+ STORM-1900
Gene Frostbite
GeneJ Composer
Geneko Nemeth
@@ -636,6 +638,7 @@ Jonathan Yap
STORM-1809
STORM-1793
STORM-1810
+ STORM-1877
STORM-1860
STORM-1852
STORM-1870
@@ -644,6 +647,7 @@ Jonathan Yap
STORM-1862
Kadah Coba
STORM-1060
+ STORM-1843
Jondan Lundquist
Josef Munster
Josette Windlow
@@ -654,6 +658,8 @@ Kage Pixel
VWR-11
Kagehi Kohn
Kaimen Takahe
+Katharine Berry
+ STORM-1900
Keklily Longfall
Ken Lavender
Ken March
@@ -739,6 +745,7 @@ Marianne McCann
Marine Kelley
STORM-281
MartinRJ Fayray
+ STORM-1844
STORM-1845
Matthew Anthony
Matthew Dowd
@@ -1108,9 +1115,12 @@ Sudane Erato
Synystyr Texan
Takeda Terrawyng
TankMaster Finesmith
+ OPEN-140
+ OPEN-142
STORM-1100
- STORM-1602
STORM-1258
+ STORM-1602
+ STORM-1868
VWR-26622
Talamasca
Tali Rosca
@@ -1228,6 +1238,8 @@ Watty Berkson
Westley Schridde
Westley Streeter
Whimsy Winx
+Whirly Fizzle
+ STORM-1895
Whoops Babii
VWR-631
VWR-1640