diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-18 00:22:30 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-18 00:22:30 +0400 |
| commit | 095f2d7ec19bc4f78ed0fa54d5ca5a4e9423f4ba (patch) | |
| tree | 4b8f293a7dbc3bbbe600eda7694153d090f89b22 /main/src/addins/MonoDeveloperExtensions | |
| parent | ae607a1050d901ae22d95cd6023a0aed2c7601e9 (diff) | |
| parent | 532138fa22ed040ed3a353d755c259163c77398f (diff) | |
Merge branch 'master' into newresolver
Conflicts:
extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
main/src/addins/NUnit/Makefile.am
main/src/addins/NUnit/MonoDevelop.NUnit.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
Diffstat (limited to 'main/src/addins/MonoDeveloperExtensions')
| -rw-r--r-- | main/src/addins/MonoDeveloperExtensions/NUnit/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/Makefile.am b/main/src/addins/MonoDeveloperExtensions/NUnit/Makefile.am index 53fb15821b..257b7c2dbb 100644 --- a/main/src/addins/MonoDeveloperExtensions/NUnit/Makefile.am +++ b/main/src/addins/MonoDeveloperExtensions/NUnit/Makefile.am @@ -1,10 +1,11 @@ FILES = MonoTestProvider.cs -REFS = -r:System +REFS = \ + -r:../../../../build/AddIns/NUnit/MonoDevelop.NUnit.dll \ + -r:System DEPS = \ $(top_builddir)/build/AddIns/MonoDeveloperExtensions/MonoDeveloperExtensions.dll \ - $(top_builddir)/build/AddIns/NUnit/MonoDevelop.NUnit.dll \ $(top_builddir)/build/bin/MonoDevelop.Core.dll ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDeveloperExtensions |