[Libreoffice-commits] core.git: Changes to 'private/jmux/trac#12015'

[Jan-Marek Glogowski]

New branch 'private/jmux/trac#12015' available with the following commits:
commit 4744662382a47b15410a3eed014479e4d2f79866
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Nov 12 12:26:02 2014 +0100

    fixup
    
    Change-Id: I8098d66b562e99447048ad9e3042cd134c14432d

commit 2b8070c29ab3ba728400c0f3d9dfd239a873279a
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date:   Mon Jun 30 17:50:23 2014 +0200

    Und die nächsten Änderungen...
    
    Change-Id: I3f8714a315157a333ba966b744dfaec3716c34d9

commit 0cc74a1987f27e74c649808235c5e890e8f110d3
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date:   Wed Jun 4 15:32:58 2014 +0200

    Schritt 2
    
    Change-Id: Icae0b3b7422ecc9b99b226a378714ea6ffabc9c9

commit 71b728643b73f270ae8a8c0a1296fc10139824fb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Nov 12 11:20:24 2014 +0100

    Schritt 1
    
    Conflicts:
    
    	sw/source/core/doc/docedt.cxx
    	sw/source/core/doc/doclay.cxx
    	sw/source/core/doc/docnew.cxx
    	sw/source/core/docnode/ndcopy.cxx
    	sw/source/core/frmedt/fecopy.cxx
    	sw/source/core/layout/frmtool.cxx
    	sw/source/core/uibase/inc/content.hxx
    	sw/source/core/uibase/utlui/content.cxx
    	sw/source/core/uibase/wrtsh/wrtsh1.cxx
    	sw/source/core/undo/rolbck.cxx
    	sw/source/core/unocore/unochart.cxx
    	sw/source/core/unocore/unocoll.cxx
    
    Change-Id: I71bdcf5712c53c2c1e097240d7c9d06824c97e60

commit 39b0eecd7771478de1aa4271d5f49c4c3e2cf296
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri May 23 19:44:33 2014 +0200

    SwFrmFmts sal_uInt6 => salInt23 or iterator
    
    Catchall for Iggi
    
    Change-Id: Idcb4c36ece27989a4d6cc1ef6193ad8fd26fc576