[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, updated. debian/2.4.1+dfsg-1-2-ge84773f

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit e84773fcca725bd05f142ef7904d1794139b579b
Merge: 98dd28d21e31eb65045f9b890ce9615ee3c99fdc d3fe54688a75728f20eb8c131d211d9b0d99682c
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Jun 23 23:25:03 2011 +0100

    Merge branch 'upstream-experimental' into master-experimental
    
    Conflicts:
    	aclocal.m4
    	build/Makefile.in
    	contrib/Makefile.in
    	contrib/Mono.Cecil/Makefile.in
    	contrib/NRefactory/Makefile.in
    	man/Makefile.in
    	po/Makefile.in
    	src/Makefile.in
    	src/addins/AspNet/Makefile.in
    	src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile.in
    	src/addins/CSharpBinding/AspNet/Makefile.in
    	src/addins/CSharpBinding/Autotools/Makefile.in
    	src/addins/ChangeLogAddIn/Makefile.in
    	src/addins/Deployment/Makefile.in
    	src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.in
    	src/addins/Deployment/MonoDevelop.Deployment/Makefile.in
    	src/addins/GnomePlatform/Makefile.in
    	src/addins/ILAsmBinding/Makefile.in
    	src/addins/Makefile.in
    	src/addins/MonoDevelop.AssemblyBrowser/Makefile.in
    	src/addins/MonoDevelop.Autotools/Makefile.in
    	src/addins/MonoDevelop.CodeMetrics/Makefile.in
    	src/addins/MonoDevelop.Debugger.Soft/Makefile.in
    	src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.in
    	src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.in
    	src/addins/MonoDevelop.DesignerSupport/Makefile.in
    	src/addins/MonoDevelop.Gettext/Makefile.in
    	src/addins/MonoDevelop.GtkCore/Makefile.in
    	src/addins/MonoDevelop.GtkCore/libstetic/Makefile.in
    	src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.in
    	src/addins/MonoDevelop.HexEditor/Makefile.in
    	src/addins/MonoDevelop.Moonlight/Makefile.in
    	src/addins/MonoDevelop.Refactoring/Makefile.in
    	src/addins/MonoDevelop.RegexToolkit/Makefile.in
    	src/addins/MonoDevelop.SourceEditor2/Makefile.in
    	src/addins/MonoDevelop.XmlEditor/Makefile.in
    	src/addins/MonoDeveloperExtensions/Makefile.in
    	src/addins/MonoDeveloperExtensions/NUnit/Makefile.in
    	src/addins/NUnit/Makefile.in
    	src/addins/NUnit/NUnitRunner/Makefile.in
    	src/addins/TextTemplating/Makefile.in
    	src/addins/TextTemplating/Mono.TextTemplating/Makefile.in
    	src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.in
    	src/addins/TextTemplating/TextTransform/Makefile.in
    	src/addins/VBNetBinding/Makefile.in
    	src/addins/VersionControl/Makefile.in
    	src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.in
    	src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.in
    	src/addins/WelcomePage/Makefile.in
    	src/addins/WindowsPlatform/Makefile.in
    	src/addins/prj2make-sharp-lib/Makefile.in
    	src/core/Makefile.in
    	src/core/MonoDevelop.Startup/Makefile.in
    	src/tools/Makefile.in
    	src/tools/SharpCoco/Makefile.in
    	src/tools/mdhost/Makefile.in
    	src/tools/mdmonitor/Makefile.in
    	tests/Makefile.in
    	theme-icons/Makefile.in


-- 
monodevelop