[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, created. debian/2.4+dfsg-3-7-gade23c4

[Jo Shields]

The branch, master-experimental has been created
        at  ade23c4d3b67dd342b41b6710450bbe7ec4564f6 (commit)

- Shortlog ------------------------------------------------------------
commit ade23c4d3b67dd342b41b6710450bbe7ec4564f6
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Dec 13 15:55:14 2010 +0000

    Import upstream git commit 5a628ccfeed02aaee060ce563ff6bd2d468bfb9e as a new patch. This fixes some code introduced in MonoDevelop 2.4.1 which requires Mono.Addins 0.5 (rather than the 0.4 cited in configure.in). Thanks to Lluis Sanchez <lluis at novell.com>

commit 3c4f7defe6df346e4e00cb54d0f78d91f55215e5
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Dec 13 14:44:21 2010 +0000

    Remove use_keyfile_not_keycontainer patch (fixed upstream)

commit 16ff5b7528debfa52a0b29ea043a20a64da0a44c
Merge: 0991342 aa1e75f
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Dec 13 14:42:32 2010 +0000

    Merge commit 'upstream/2.4.1+dfsg' into master-experimental
    
    Conflicts:
    	Makefile.in
    	src/addins/MacPlatform/Makefile.in
    	src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.in
    	src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.in
    	src/core/Mono.Debugging/Makefile.in
    	src/core/MonoDevelop.Ide/Makefile.in
    	src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.in

commit 0991342fd53d2a3db2e4939a1cf4095b2544dd3a
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Dec 13 14:36:14 2010 +0000

    Add a gbp.conf since we're building in a separate branch for Debian Experimental

-----------------------------------------------------------------------

-- 
monodevelop