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/Archiver
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-80457111e0779f296080f4e26c6e56ac1263cba4.zip
opensim-SC-80457111e0779f296080f4e26c6e56ac1263cba4.tar.gz
opensim-SC-80457111e0779f296080f4e26c6e56ac1263cba4.tar.bz2
opensim-SC-80457111e0779f296080f4e26c6e56ac1263cba4.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 729e9f7..2eb2861 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
 using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;
 using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;
 using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;
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/Archiver
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-80457111e0779f296080f4e26c6e56ac1263cba4.zip opensim-SC-80457111e0779f296080f4e26c6e56ac1263cba4.tar.gz opensim-SC-80457111e0779f296080f4e26c6e56ac1263cba4.tar.bz2 opensim-SC-80457111e0779f296080f4e26c6e56ac1263cba4.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 729e9f7..2eb2861 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
43	using OpenSim.Region.Framework.Scenes.Serialization;	43	using OpenSim.Region.Framework.Scenes.Serialization;
44	using OpenSim.Tests.Common;	44	using OpenSim.Tests.Common;
45	using OpenSim.Tests.Common.Mock;	45	using OpenSim.Tests.Common.Mock;
46	using OpenSim.Tests.Common.Setup;
47	using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;	46	using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;
48	using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;	47	using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;
49	using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;	48	using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;