diff options
| author | Melanie | 2012-09-07 19:49:46 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-07 19:49:46 +0100 |
| commit | 924df14c5e15185e14c144164dd80d9859d5c583 (patch) | |
| tree | 110f0e402b879f49943ff2e76598e2241e20057c /CONTRIBUTORS.txt | |
| parent | Revert "made setting rotation match Second Life" (diff) | |
| parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
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 9dd0797..7c07a2a 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -92,6 +92,7 @@ what it is today. | |||
| 92 | * Flyte Xevious | 92 | * Flyte Xevious |
| 93 | * Garmin Kawaguichi | 93 | * Garmin Kawaguichi |
| 94 | * Gryc Ueusp | 94 | * Gryc Ueusp |
| 95 | * Hiro Lecker | ||
| 95 | * Imaze Rhiano | 96 | * Imaze Rhiano |
| 96 | * Intimidated | 97 | * Intimidated |
| 97 | * Jeremy Bongio (IBM) | 98 | * Jeremy Bongio (IBM) |