summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-08 20:16:35 -0400
committerOz Linden <oz@lindenlab.com>2011-07-08 20:16:35 -0400
commit093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch)
tree9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /doc
parent187bc5211437718016a22e60c7b5ed29823c8510 (diff)
parent255fc0401ebde80cfde88995a18fc77a36e3479b (diff)
merge changes for storm-1489
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt16
1 files changed, 1 insertions, 15 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7a3d2a2485..bad78dcd5f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -103,8 +103,6 @@ Ales Beaumont
Alexandrea Fride
STORM-255
STORM-960
- STORM-1327
- STORM-1406
Alissa Sabre
VWR-81
VWR-83
@@ -161,6 +159,7 @@ Ann Congrejo
Ansariel Hiller
STORM-1101
VWR-25480
+ VWR-26150
Ardy Lay
STORM-859
VWR-19499
@@ -446,20 +445,9 @@ Jonathan Yap
STORM-1236
STORM-1259
STORM-787
- VWR-25480
- STORM-1334
STORM-1313
STORM-899
STORM-1273
- STORM-457
- STORM-1452
- STORM-1406
- STORM-1327
- STORM-1396
- STORM-1292
- STORM-1392
- STORM-1302
- STORM-1326
STORM-1462
Kage Pixel
VWR-11
@@ -793,7 +781,6 @@ Strife Onizuka
SNOW-691
TankMaster Finesmith
STORM-1100
- STORM-1452
Tayra Dagostino
SNOW-517
SNOW-543
@@ -926,7 +913,6 @@ WolfPup Lowenhar
STORM-825
STORM-859
STORM-1098
- STORM-1393
VWR-20741
VWR-20933
Zai Lynch