summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-17 16:50:35 -0400
committerOz Linden <oz@lindenlab.com>2013-06-17 16:50:35 -0400
commit761bf254a4e72ec521ff1a52ac12f8594a350818 (patch)
treec72f84bb4ac319c10299a35934b52a09a73a127d /doc
parenta2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff)
parent1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff)
merge changes for 3.6.0-release
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index df8f8b9803..4c1fe1c077 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -406,6 +406,7 @@ Ganymedes Costagravas
Geenz Spad
STORM-1823
STORM-1900
+ NORSPEC-229
Gene Frostbite
GeneJ Composer
Geneko Nemeth
@@ -654,6 +655,7 @@ Jonathan Yap
STORM-1858
STORM-1862
STORM-1918
+ OPEN-161
Kadah Coba
STORM-1060
STORM-1843
@@ -1032,6 +1034,7 @@ Ryozu Kojima
VWR-287
Sachi Vixen
Sahkolihaa Contepomi
+ MATBUG-102
Saii Hallard
SaintLEOlions Zimer
Salahzar Stenvaag
@@ -1183,6 +1186,7 @@ Techwolf Lupindo
SNOW-746
VWR-12385
VWR-20893
+ OPEN-161
Templar Merlin
tenebrous pau
VWR-247
@@ -1250,6 +1254,7 @@ Vadim Bigbear
VWR-2681
Vaalith Jinn
STORM-64
+ MATBUG-8
Vector Hastings
VWR-8726
Veritas Raymaker