diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /CONTRIBUTORS.txt | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 246c669..5c1bdf1 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -111,6 +111,7 @@ what it is today. | |||
| 111 | * Mircea Kitsune | 111 | * Mircea Kitsune |
| 112 | * mpallari | 112 | * mpallari |
| 113 | * MrMonkE | 113 | * MrMonkE |
| 114 | * Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) | ||
| 114 | * nornalbion | 115 | * nornalbion |
| 115 | * Omar Vera Ustariz (IBM) | 116 | * Omar Vera Ustariz (IBM) |
| 116 | * openlifegrid.com | 117 | * openlifegrid.com |