diff options
| author | Robert Adams | 2014-01-11 08:52:23 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-11 08:52:23 -0800 |
| commit | 1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f (patch) | |
| tree | 125392101f83c8e7cb239848ae7a6cc12595b1a2 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Fix crash in BulletSim which sometimes happens making a linkset physical (diff) | |
| download | opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.zip opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.gz opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.bz2 opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.xz | |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
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 ef84315..ee3d7c7 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -75,6 +75,7 @@ what it is today. | |||
| 75 | * Chris Yeoh (IBM) | 75 | * Chris Yeoh (IBM) |
| 76 | * controlbreak | 76 | * controlbreak |
| 77 | * coyled | 77 | * coyled |
| 78 | * ctrlaltdavid | ||
| 78 | * Daedius | 79 | * Daedius |
| 79 | * daTwitch | 80 | * daTwitch |
| 80 | * devalnor-#708 | 81 | * devalnor-#708 |