summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-05 06:15:03 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-05 06:15:03 -0700
commitdb85ed33e03c81b69ec020f6daf302bc2478163e (patch)
treea2c47fdda14579beabf33a660b7c522076b93f33 /doc
parent50689a13baf07bcd68bfb77b111b066da972f076 (diff)
parentedf0a0c7f5dcfee2010447bc877515b70d1b1059 (diff)
MErge
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b942bc4c19..66ccb404a8 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -404,6 +404,7 @@ Ganymedes Costagravas
Geenz Spad
STORM-1823
STORM-1900
+ NORSPEC-229
Gene Frostbite
GeneJ Composer
Geneko Nemeth