diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
| commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
| tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /doc | |
| parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
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 | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/releasenotes-where.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/translations.txt | 0 |
6 files changed, 5 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 526cd4ea28..37344bc0d8 100644..100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1074,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 @@ -1095,6 +1097,8 @@ SLB Wirefly Slee Mayo SEC-1075 snowy Sidran +Sovereign Engineer + MAINT-2334 SpacedOut Frye VWR-34 VWR-45 @@ -1348,3 +1352,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 |