diff options
| author | Mic Bowman | 2011-08-26 15:23:46 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-26 15:23:46 -0700 |
| commit | 23f10f1d22d5ecf542119e39503230994c521bf0 (patch) | |
| tree | 2498e8cccf2ed398052dfa53e9a1faf6e998d039 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar (diff) | |
| download | opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.zip opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.gz opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.bz2 opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.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 b73a87d..2fe8b46 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -113,6 +113,7 @@ what it is today. | |||
| 113 | * mpallari | 113 | * mpallari |
| 114 | * MrMonkE | 114 | * MrMonkE |
| 115 | * Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) | 115 | * Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) |
| 116 | * Neil Canham | ||
| 116 | * nornalbion | 117 | * nornalbion |
| 117 | * Omar Vera Ustariz (IBM) | 118 | * Omar Vera Ustariz (IBM) |
| 118 | * openlifegrid.com | 119 | * openlifegrid.com |