Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2011-05-21 14:07:30 -0700
committer: Diva Canto 2011-05-21 14:07:30 -0700
commit: 80457111e0779f296080f4e26c6e56ac1263cba4 (patch)
tree: 4a2df3859ad5f71be49a55add550c98a6af04f68 /OpenSim/Region/ScriptEngine/Shared/Tests
parent: HG Friends working to some extent: friendships offered and accepted correctly... (diff)
parent: Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te... (diff)
download: opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.zip
opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.gz
opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.bz2
opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 1d55b95..80b60a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using OpenSim.Tests.Common;
 using OpenSim.Region.ScriptEngine.Shared;
-using OpenSim.Tests.Common.Setup;
 using OpenSim.Region.Framework.Scenes;
 using Nini.Config;
 using OpenSim.Region.ScriptEngine.Shared.Api;
author	Diva Canto	2011-05-21 14:07:30 -0700
committer	Diva Canto	2011-05-21 14:07:30 -0700
commit	80457111e0779f296080f4e26c6e56ac1263cba4 (patch)
tree	4a2df3859ad5f71be49a55add550c98a6af04f68 /OpenSim/Region/ScriptEngine/Shared/Tests
parent	HG Friends working to some extent: friendships offered and accepted correctly... (diff)
parent	Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te... (diff)
download	opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.zip opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.gz opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.bz2 opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs index 1d55b95..80b60a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
29	using NUnit.Framework;	29	using NUnit.Framework;
30	using OpenSim.Tests.Common;	30	using OpenSim.Tests.Common;
31	using OpenSim.Region.ScriptEngine.Shared;	31	using OpenSim.Region.ScriptEngine.Shared;
32	using OpenSim.Tests.Common.Setup;
33	using OpenSim.Region.Framework.Scenes;	32	using OpenSim.Region.Framework.Scenes;
34	using Nini.Config;	33	using Nini.Config;
35	using OpenSim.Region.ScriptEngine.Shared.Api;	34	using OpenSim.Region.ScriptEngine.Shared.Api;