diff options
| author | Melanie | 2012-05-07 12:07:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-07 12:07:47 +0100 |
| commit | df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2 (patch) | |
| tree | 3e36b8757455c88c3c1f20c14b635e662350aab9 /CONTRIBUTORS.txt | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O... (diff) | |
| download | opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.zip opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.gz opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.bz2 opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index bb0db0d..e1de751 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -205,3 +205,4 @@ In addition, we would like to thank: | |||
| 205 | * The Mono Project | 205 | * The Mono Project |
| 206 | * The NANT Developers | 206 | * The NANT Developers |
| 207 | * Microsoft (.NET, MSSQL-Adapters) | 207 | * Microsoft (.NET, MSSQL-Adapters) |
| 208 | *x | ||