diff options
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/Framework | |
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 |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Tests/AnimationTests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs index 9aa95af..aa4c6aa 100644 --- a/OpenSim/Framework/Tests/AnimationTests.cs +++ b/OpenSim/Framework/Tests/AnimationTests.cs | |||
@@ -33,7 +33,6 @@ using OpenMetaverse.StructuredData; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Tests.Common; | 34 | using OpenSim.Tests.Common; |
35 | using OpenSim.Tests.Common.Mock; | 35 | using OpenSim.Tests.Common.Mock; |
36 | using OpenSim.Tests.Common.Setup; | ||
37 | using Animation = OpenSim.Framework.Animation; | 36 | using Animation = OpenSim.Framework.Animation; |
38 | 37 | ||
39 | namespace OpenSim.Framework.Tests | 38 | namespace OpenSim.Framework.Tests |