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/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
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/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index a866fd9..4f752ab 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Setup;
 namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
 {
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/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
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/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index a866fd9..4f752ab 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework;
35	using OpenSim.Region.Framework.Scenes;	35	using OpenSim.Region.Framework.Scenes;
36	using OpenSim.Region.Framework.Scenes.Serialization;	36	using OpenSim.Region.Framework.Scenes.Serialization;
37	using OpenSim.Tests.Common;	37	using OpenSim.Tests.Common;
38	using OpenSim.Tests.Common.Setup;
39		38
40	namespace OpenSim.Region.CoreModules.World.Serialiser.Tests	39	namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
41	{	40	{