diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-03-03 11:43:22 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-03-03 11:43:22 +0400 |
| commit | 79661d5405e04766cfb3ad531b7fe5af2f43e7f5 (patch) | |
| tree | afa4eafd41e04d5fe7f3e36ad6c0b9b41bb481a6 /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git | |
| parent | 06062775726d85c32d4947e0d27b299f1c56c3fb (diff) | |
| parent | 2b0835b6f38a0eaea16a5d1d575e89897d3b8ef6 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
version-checks
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl.Git')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am index 1759861107..b0e99af144 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am @@ -8,7 +8,6 @@ DEPS = \ $(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \ $(top_builddir)/build/bin/Mono.TextEditor.dll \ $(top_builddir)/build/bin/MonoDevelop.Core.dll \ - $(top_builddir)/build/bin/MonoDevelop.Ide.dll \ $(top_builddir)/contrib/bin/NGit.dll \ $(top_builddir)/contrib/bin/NSch.dll \ $(top_builddir)/contrib/bin/Sharpen.dll @@ -16,6 +15,7 @@ DEPS = \ REFS = \ $(GLIB_SHARP_LIBS) \ $(GTK_SHARP_LIBS) \ + -r:../../../../build/bin/MonoDevelop.Ide.dll \ -r:Mono.Posix \ -r:System \ -r:System.Core |