diff options
| author | Melanie | 2012-04-27 22:28:09 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-27 22:28:09 +0100 |
| commit | dcbcbd697f70d361b63d502512d2731e0ee6e046 (patch) | |
| tree | 8168b0dc214e9cb710b0972d5f03a7da3164189b /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix prebuild.xml (diff) | |
| download | opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.zip opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.gz opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.bz2 opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
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 1370449..ad95cf7 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -143,6 +143,7 @@ what it is today. | |||
| 143 | * sempuki | 143 | * sempuki |
| 144 | * SignpostMarv | 144 | * SignpostMarv |
| 145 | * SpotOn3D | 145 | * SpotOn3D |
| 146 | * Stefan_Boom / stoehr | ||
| 146 | * Strawberry Fride | 147 | * Strawberry Fride |
| 147 | * Talun | 148 | * Talun |
| 148 | * tglion | 149 | * tglion |