  src/addins/MonoDevelop.XmlEditor/Makefile
  src/addins/MonoDevelop.CodeMetrics/Makefile
  src/addins/MonoDevelop.Refactoring/Makefile
-@@ -376,7 +375,6 @@
+@@ -332,7 +331,6 @@
  src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile
  src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile
  src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile
 -src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile
  src/addins/MonoDevelop.HexEditor/Makefile
+ src/addins/MonoDevelop.DocFood/Makefile
  tests/Makefile
- tests/UnitTests/Makefile
 Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
 ===================================================================
---- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2010-06-16 12:37:20.778579690 +0100
-+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2010-06-16 12:37:28.488580745 +0100
-@@ -2,5 +2,4 @@
- 	Mono.Debugger.Soft \
+--- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2011-06-23 23:07:40.000000000 +0100
++++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2011-06-24 00:19:06.000000000 +0100
+@@ -1,5 +1,4 @@
+ SUBDIRS = \
  	Mono.Debugging.Soft \
  	MonoDevelop.Debugger.Soft \
 -	MonoDevelop.Debugger.Soft.AspNet \

+	MonoDevelop.CodeMetrics \
+	MonoDevelop.Debugger.Soft \
+	WindowsPlatform \
+	MonoDevelop.HexEditor
Index: monodevelop.git/configure.in
===================================================================
--- monodevelop.git.orig/configure.in	2010-06-16 12:37:35.958569809 +0100
+++ monodevelop.git/configure.in	2010-06-16 12:37:49.308571279 +0100
@@ -366,7 +366,6 @@
 src/addins/WindowsPlatform/Makefile
 src/addins/MonoDevelop.AssemblyBrowser/Makefile
 src/addins/MonoDevelop.SourceEditor2/Makefile

+Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
Index: monodevelop.git/src/addins/Makefile.am
===================================================================
--- monodevelop.git.orig/src/addins/Makefile.am	2011-06-23 23:13:22.000000000 +0100
+++ monodevelop.git/src/addins/Makefile.am	2011-06-24 00:19:22.000000000 +0100
@@ -1,34 +1,33 @@
 
-SUBDIRS = \
-	MacPlatform \
