diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-18 09:59:14 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-18 09:59:14 +0400 |
| commit | a6e1400af37feff0af739bdf7f4fa788016cc7b3 (patch) | |
| tree | d6517af93b46326d3b680674e429fceb76697c09 /main/src/addins/NUnit | |
| parent | ad63357a0aa97c8b10f01ec3c1e54c54ec1f6f68 (diff) | |
| parent | a4954f61e72d18c33e4803e20105407830ad623d (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/MonoDevelop.MacDev/Makefile.am
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/TypeResolverVisitor.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
Diffstat (limited to 'main/src/addins/NUnit')
| -rw-r--r-- | main/src/addins/NUnit/MonoDevelopNUnit.addin.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml index 86566517cd..bde3c59602 100644 --- a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml +++ b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml @@ -6,7 +6,7 @@ url = "http://monodevelop.com" description = "Integrates NUnit into the MonoDevelop IDE." category = "Testing" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.NUnit.dll" /> @@ -17,8 +17,8 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> </Dependencies> <!-- Extension Points --> |