summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:35:23 -0600
committerCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:35:23 -0600
commit35b27d558caa8a719e6648e0bf3129629c1cc5fa (patch)
tree6a1d20ad270bd7df3141e91ec9ba0ff0a080a6fc /doc
parent38c1cd2d29fa48b1a28a6ba1d7ef49ae00c9a5e0 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'doc')
-rwxr-xr-x[-rw-r--r--]doc/LGPL-licence.txt0
-rwxr-xr-x[-rw-r--r--]doc/LICENSE-logos.txt0
-rwxr-xr-x[-rw-r--r--]doc/LICENSE-source.txt0
-rwxr-xr-x[-rw-r--r--]doc/contributions.txt11
-rwxr-xr-x[-rw-r--r--]doc/releasenotes-where.txt0
-rwxr-xr-x[-rw-r--r--]doc/translations.txt0
6 files changed, 11 insertions, 0 deletions
diff --git a/doc/LGPL-licence.txt b/doc/LGPL-licence.txt
index 4362b49151..4362b49151 100644..100755
--- a/doc/LGPL-licence.txt
+++ b/doc/LGPL-licence.txt
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt
index e63c48e542..e63c48e542 100644..100755
--- a/doc/LICENSE-logos.txt
+++ b/doc/LICENSE-logos.txt
diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt
index 407402265e..407402265e 100644..100755
--- a/doc/LICENSE-source.txt
+++ b/doc/LICENSE-source.txt
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 62a51b7c97..9a390f6660 100644..100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -405,6 +405,7 @@ Ganymedes Costagravas
Geenz Spad
STORM-1823
STORM-1900
+ NORSPEC-229
Gene Frostbite
GeneJ Composer
Geneko Nemeth
@@ -648,6 +649,7 @@ Jonathan Yap
STORM-1872
STORM-1858
STORM-1862
+ OPEN-161
Kadah Coba
STORM-1060
STORM-1843
@@ -901,6 +903,7 @@ Nicky Dasmijn
VWR-29228
MAINT-873
SUN-72
+ BUG-2432
Nicky Perian
OPEN-1
STORM-1087
@@ -1023,6 +1026,7 @@ Ryozu Kojima
VWR-287
Sachi Vixen
Sahkolihaa Contepomi
+ MATBUG-102
Saii Hallard
SaintLEOlions Zimer
Salahzar Stenvaag
@@ -1070,10 +1074,12 @@ Sheet Spotter
Shnurui Troughton
Shyotl Kuhr
MAINT-1138
+ MAINT-2334
Siana Gearz
STORM-960
STORM-1088
MAINT-1138
+ MAINT-2334
sicarius Thorne
Sicarius Toxx
SignpostMarv Martin
@@ -1091,6 +1097,8 @@ SLB Wirefly
Slee Mayo
SEC-1075
snowy Sidran
+Sovereign Engineer
+ MAINT-2334
SpacedOut Frye
VWR-34
VWR-45
@@ -1169,6 +1177,7 @@ Techwolf Lupindo
SNOW-746
VWR-12385
VWR-20893
+ OPEN-161
Templar Merlin
tenebrous pau
VWR-247
@@ -1236,6 +1245,7 @@ Vadim Bigbear
VWR-2681
Vaalith Jinn
STORM-64
+ MATBUG-8
Vector Hastings
VWR-8726
Veritas Raymaker
@@ -1344,3 +1354,4 @@ Zoex Flanagan
+
diff --git a/doc/releasenotes-where.txt b/doc/releasenotes-where.txt
index 4af5866905..4af5866905 100644..100755
--- a/doc/releasenotes-where.txt
+++ b/doc/releasenotes-where.txt
diff --git a/doc/translations.txt b/doc/translations.txt
index 9b7f2d6292..9b7f2d6292 100644..100755
--- a/doc/translations.txt
+++ b/doc/translations.txt