diff options
| author | Matt Ward <ward.matt@gmail.com> | 2014-02-20 00:44:49 +0400 |
|---|---|---|
| committer | Matt Ward <ward.matt@gmail.com> | 2014-02-20 00:44:49 +0400 |
| commit | 21c9216b7f56515c0da8743181c001931f076b65 (patch) | |
| tree | 12d071121d2ac7490e78d73b8c57e0e779892e09 /main/tests | |
| parent | 4d36b0730a08f903c39dd041bd4f02c85d13d229 (diff) | |
| parent | aad8ab4ede3226dc7a6b8dbf2cb87615ceec1538 (diff) | |
Merge branch 'nuget-integration' of github.com:mono/monodevelop into retina
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectDialog.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/tests')
| -rw-r--r-- | main/tests/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am index dedea8860f..2e6e251bf0 100644 --- a/main/tests/Makefile.am +++ b/main/tests/Makefile.am @@ -28,6 +28,7 @@ TEST_ASSEMBLIES_COMMON = \ $(TEST_DIR)/UnitTests.dll \ $(TEST_DIR)/MonoDevelop.Debugger.Tests.dll \ $(TEST_DIR)/Mono.TextTemplating.Tests.dll \ + $(TEST_DIR)/MonoDevelop.PackageManagement.Tests.dll \ $(TEST_DIR)/MonoDevelop.TextEditor.Tests.dll \ $(TEST_DIR)/MonoDevelop.XmlEditor.Tests.dll \ $(EXTERNAL)/nrefactory/bin/Debug/ICSharpCode.NRefactory.Tests.dll |