diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-06-26 17:39:23 +0100 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-06-26 17:39:23 +0100 |
| commit | b615858d6c41c29b3b610ec0dba09f30b1f8b3a8 (patch) | |
| tree | 2b193625c9ed4a0ca36e5b5f99f1cc765e979d74 /doc | |
| parent | e63d92ab504d74399cae2a9cc7625ef3ec330c38 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Merging last four months of development
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 | 17 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/releasenotes-where.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/translations.txt | 0 |
6 files changed, 17 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 1e1401c734..6d0dde609e 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 @@ -403,6 +404,7 @@ Ganymedes Costagravas Geenz Spad STORM-1823 STORM-1900 + NORSPEC-229 Gene Frostbite GeneJ Composer Geneko Nemeth @@ -653,6 +655,7 @@ Jonathan Yap STORM-1872 STORM-1858 STORM-1862 + OPEN-161 Kadah Coba STORM-1060 STORM-1843 @@ -751,10 +754,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 @@ -902,6 +907,9 @@ NickyD MAINT-873 Nicky Dasmijn VWR-29228 + MAINT-873 + SUN-72 + BUG-2432 Nicky Perian OPEN-1 STORM-1087 @@ -1024,6 +1032,7 @@ Ryozu Kojima VWR-287 Sachi Vixen Sahkolihaa Contepomi + MATBUG-102 Saii Hallard SaintLEOlions Zimer Salahzar Stenvaag @@ -1071,10 +1080,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 @@ -1092,6 +1103,8 @@ SLB Wirefly Slee Mayo SEC-1075 snowy Sidran +Sovereign Engineer + MAINT-2334 SpacedOut Frye VWR-34 VWR-45 @@ -1170,6 +1183,7 @@ Techwolf Lupindo SNOW-746 VWR-12385 VWR-20893 + OPEN-161 Templar Merlin tenebrous pau VWR-247 @@ -1237,6 +1251,7 @@ Vadim Bigbear VWR-2681 Vaalith Jinn STORM-64 + MATBUG-8 Vector Hastings VWR-8726 Veritas Raymaker @@ -1257,6 +1272,7 @@ Whimsy Winx Whirly Fizzle STORM-1895 MAINT-873 + STORM-1930 Whoops Babii VWR-631 VWR-1640 @@ -1340,3 +1356,4 @@ Zipherius Turas VWR-76 VWR-77 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 |