diff options
| author | Justin Clark-Casey (justincc) | 2014-03-20 20:15:57 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-20 20:15:57 +0000 |
| commit | d04bb3ca9b992b1c64af4570df8a3218b2ef25e7 (patch) | |
| tree | 823acda5425d13b85a0e79d983f5a96a06e3a51e /CONTRIBUTORS.txt | |
| parent | Mantis 6974 PERMISSION_TRACK_CAMERA should be implicit on attach. (diff) | |
| parent | Allow MaptileStaticFile path to be set to anywhere and not force it to bin/ma... (diff) | |
| download | opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.zip opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.tar.gz opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.tar.bz2 opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 b17ab8b..d89f461 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -101,6 +101,7 @@ what it is today. | |||
| 101 | * Iain Oliver | 101 | * Iain Oliver |
| 102 | * Imaze Rhiano | 102 | * Imaze Rhiano |
| 103 | * Intimidated | 103 | * Intimidated |
| 104 | * Jak Daniels | ||
| 104 | * Jeremy Bongio (IBM) | 105 | * Jeremy Bongio (IBM) |
| 105 | * jhurliman | 106 | * jhurliman |
| 106 | * John R Sohn (XenReborn) | 107 | * John R Sohn (XenReborn) |