diff options
| author | Melanie | 2012-09-27 15:49:19 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-27 15:49:19 +0100 |
| commit | 62d7350ae4d5fb0618a069eaeae111ba08e005d2 (patch) | |
| tree | d1ed93297e5152b7a47fa83056bb83d50c0c2636 | |
| parent | Merge commit '2bf42f30af5030890b8e3ff5bb29074a1f0e9085' into careminster (diff) | |
| parent | just testing to see if pcampbot is alive yet (diff) | |
| download | opensim-SC-62d7350ae4d5fb0618a069eaeae111ba08e005d2.zip opensim-SC-62d7350ae4d5fb0618a069eaeae111ba08e005d2.tar.gz opensim-SC-62d7350ae4d5fb0618a069eaeae111ba08e005d2.tar.bz2 opensim-SC-62d7350ae4d5fb0618a069eaeae111ba08e005d2.tar.xz | |
Merge branch 'master' into careminster
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7c07a2a..43f79dd 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -209,3 +209,4 @@ In addition, we would like to thank: | |||
| 209 | * The NANT Developers | 209 | * The NANT Developers |
| 210 | * Microsoft (.NET, MSSQL-Adapters) | 210 | * Microsoft (.NET, MSSQL-Adapters) |
| 211 | *x | 211 | *x |
| 212 | |||