diff options
author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
---|---|---|
committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /CONTRIBUTORS.txt | |
parent | UbitOde: remove useless water collider from active code. (diff) | |
parent | Merge branch 'avination' into careminster (diff) | |
download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-rw-r--r-- | CONTRIBUTORS.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 3013277..b1c3452 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -143,7 +143,11 @@ what it is today. | |||
143 | * sempuki | 143 | * sempuki |
144 | * SignpostMarv | 144 | * SignpostMarv |
145 | * SpotOn3D | 145 | * SpotOn3D |
146 | * Stefan_Boom / stoehr | ||
146 | * Strawberry Fride | 147 | * Strawberry Fride |
148 | * Talun | ||
149 | * TechplexEngineer (Blake Bourque) | ||
150 | * TBG Renfold | ||
147 | * tglion | 151 | * tglion |
148 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 152 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |
149 | * tyre | 153 | * tyre |
@@ -202,3 +206,4 @@ In addition, we would like to thank: | |||
202 | * The Mono Project | 206 | * The Mono Project |
203 | * The NANT Developers | 207 | * The NANT Developers |
204 | * Microsoft (.NET, MSSQL-Adapters) | 208 | * Microsoft (.NET, MSSQL-Adapters) |
209 | *x | ||