diff options
| author | Melanie | 2012-04-30 19:04:38 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-30 19:04:38 +0100 |
| commit | 4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch) | |
| tree | 4a1a8386e77f584c900229f1e8ddb08058d07697 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff) | |
| download | opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2 opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.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 ad95cf7..8a1141f 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -146,6 +146,7 @@ what it is today. | |||
| 146 | * Stefan_Boom / stoehr | 146 | * Stefan_Boom / stoehr |
| 147 | * Strawberry Fride | 147 | * Strawberry Fride |
| 148 | * Talun | 148 | * Talun |
| 149 | * TBG Renfold | ||
| 149 | * tglion | 150 | * tglion |
| 150 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 151 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |
| 151 | * tyre | 152 | * tyre |