diff options
author | Geenz <geenz@geenzo.com> | 2013-05-13 22:22:51 -0400 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-05-13 22:22:51 -0400 |
commit | 3779e51bfc2010877960d11b463c7316514bf991 (patch) | |
tree | ab528a6e7f78f136f9d0f0f7e939264897a44ae1 /doc | |
parent | b27899ee0e035ebd4072a5e6162678f2afe81053 (diff) | |
parent | 4dd245055f3417d8f8fb611a198ed5671dbce292 (diff) |
Merged with https://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'doc')
-rwxr-xr-x[-rw-r--r--] | doc/LGPL-licence.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | doc/LICENSE-logos.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | doc/LICENSE-source.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | doc/contributions.txt | 9 | ||||
-rwxr-xr-x[-rw-r--r--] | doc/releasenotes-where.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | doc/translations.txt | 0 |
6 files changed, 9 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 f7f528e084..efb855cde3 100644..100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -299,6 +299,7 @@ ChickyBabes Zuzu Christopher Organiser Ciaran Laval Cinder Roxley + BUG-2326 STORM-1703 Clara Young Coaldust Numbers @@ -746,10 +747,12 @@ Marc Claridge Marc2 Sands Marianne McCann Marine Kelley + CHUIBUG-134 STORM-281 MartinRJ Fayray STORM-1844 STORM-1845 + STORM-1934 Matthew Anthony Matthew Dowd VWR-1344 @@ -898,6 +901,7 @@ NickyD Nicky Dasmijn VWR-29228 MAINT-873 + SUN-72 Nicky Perian OPEN-1 STORM-1087 @@ -1067,10 +1071,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 @@ -1088,6 +1094,8 @@ SLB Wirefly Slee Mayo SEC-1075 snowy Sidran +Sovereign Engineer + MAINT-2334 SpacedOut Frye VWR-34 VWR-45 @@ -1341,3 +1349,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 |