diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/TestHelpers.cs (renamed from OpenSim/Tests/Common/TestHelper.cs) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelpers.cs index 86bd107..ced06de 100644 --- a/OpenSim/Tests/Common/TestHelper.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
@@ -32,7 +32,7 @@ using OpenMetaverse; | |||
32 | 32 | ||
33 | namespace OpenSim.Tests.Common | 33 | namespace OpenSim.Tests.Common |
34 | { | 34 | { |
35 | public class TestHelper | 35 | public class TestHelpers |
36 | { | 36 | { |
37 | public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) | 37 | public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) |
38 | { | 38 | { |