aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2011-05-21 14:07:30 -0700
committerDiva Canto2011-05-21 14:07:30 -0700
commit80457111e0779f296080f4e26c6e56ac1263cba4 (patch)
tree4a2df3859ad5f71be49a55add550c98a6af04f68 /OpenSim/Framework
parentHG Friends working to some extent: friendships offered and accepted correctly... (diff)
parentGet rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te... (diff)
downloadopensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.zip
opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.gz
opensim-SC_OLD-80457111e0779f296080f4e26c6e56ac1263cba4.tar.bz2
opensim-SC_OLD-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.cs1
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;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Tests.Common; 34using OpenSim.Tests.Common;
35using OpenSim.Tests.Common.Mock; 35using OpenSim.Tests.Common.Mock;
36using OpenSim.Tests.Common.Setup;
37using Animation = OpenSim.Framework.Animation; 36using Animation = OpenSim.Framework.Animation;
38 37
39namespace OpenSim.Framework.Tests 38namespace OpenSim.Framework.Tests