summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2013-01-30 15:25:09 -0800
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2013-01-30 15:25:09 -0800
commitee87ef23037f5e2904dfea3da061a9548cc113f5 (patch)
treed3aaa5405c97866529e2029572d81ebbd90b8d4a /doc
parent07b557cef909d74cd514b2d7e6b666edbfae3ef2 (diff)
parent60d1404b212824939b8bcd17fd2cc1e46e9bac55 (diff)
merge downstream code from viewer-lion
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a0e3ca463c..4f9af68e3b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -477,6 +477,7 @@ Hiro Sommambulist
Hitomi Tiponi
STORM-1741
STORM-1862
+ BUG-1067
Holger Gilruth
Horatio Freund
Hoze Menges
@@ -895,6 +896,7 @@ NickyD
MAINT-873
Nicky Dasmijn
VWR-29228
+ MAINT-873
Nicky Perian
OPEN-1
STORM-1087
@@ -1062,9 +1064,12 @@ Shawn Kaufmat
SNOW-240
Sheet Spotter
Shnurui Troughton
+Shyotl Kuhr
+ MAINT-1138
Siana Gearz
STORM-960
STORM-1088
+ MAINT-1138
sicarius Thorne
Sicarius Toxx
SignpostMarv Martin