diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-19 14:42:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-19 14:42:56 -0400 |
| commit | 3bb708d70636188b91a6e8476a3b899441de0468 (patch) | |
| tree | 85790d906bed73e19138004c4a54fc3fed952d85 /doc | |
| parent | 327c99cadbcbe15442eaee8e0625ade17dcda61f (diff) | |
| parent | ddd5659f815a39e9a8ef0e86c911fea75a7d8848 (diff) | |
merge up to latest viewer-development for merge to 3.5.2
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 | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/releasenotes-where.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/translations.txt | 0 |
6 files changed, 6 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 32dd3c1a2e..9f2f51f248 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 @@ -1067,10 +1068,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 +1091,8 @@ SLB Wirefly Slee Mayo SEC-1075 snowy Sidran +Sovereign Engineer + MAINT-2334 SpacedOut Frye VWR-34 VWR-45 @@ -1341,3 +1346,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 |