[qet] [GIT] qet/qet.git branch test_merge created. 0.8-dev-882-g32a9049

[<git@xxxxxxxxxxxxx>]

This is an automated email from git. It was generated because a ref
change was pushed to the "qet/qet.git" repository.

The branch, test_merge has been created
        at  32a90493bdae18471c68b4f03c15b58cbb743a93 (commit)

- Log -----------------------------------------------------------------
commit 32a90493bdae18471c68b4f03c15b58cbb743a93
Merge: 3640128 eb5494c
Author: Simon De Backer <simondebacker@xxxxxxx>
Date:   Tue Oct 13 21:51:34 2020 +0200

    TEST a Merge branch 'XMLProperties'
    
    it gets built let's test it for bugs
    
     Conflicts:
    	sources/ElementsCollection/fileelementcollectionitem.cpp
    	sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
    	sources/borderproperties.cpp
    	sources/conductorproperties.cpp
    	sources/conductorproperties.h
    	sources/diagram.cpp
    	sources/diagram.h
    	sources/diagramprintdialog.cpp
    	sources/diagramprintdialog.h
    	sources/editor/graphicspart/customelementgraphicpart.cpp
    	sources/editor/graphicspart/partarc.cpp
    	sources/editor/graphicspart/partdynamictextfield.cpp
    	sources/editor/graphicspart/partdynamictextfield.h
    	sources/editor/graphicspart/partellipse.cpp
    	sources/editor/graphicspart/partline.cpp
    	sources/editor/graphicspart/partpolygon.cpp
    	sources/editor/graphicspart/partrectangle.cpp
    	sources/editor/graphicspart/partterminal.cpp
    	sources/editor/graphicspart/partterminal.h
    	sources/editor/graphicspart/parttext.cpp
    	sources/properties/propertiesinterface.cpp
    	sources/properties/propertiesinterface.h
    	sources/properties/terminaldata.cpp
    	sources/properties/terminaldata.h
    	sources/properties/xrefproperties.cpp
    	sources/properties/xrefproperties.h
    	sources/qetgraphicsitem/conductor.cpp
    	sources/qetgraphicsitem/conductor.h
    	sources/qetgraphicsitem/conductortextitem.h
    	sources/qetgraphicsitem/dynamicelementtextitem.h
    	sources/qetgraphicsitem/element.cpp
    	sources/qetgraphicsitem/element.h
    	sources/qetgraphicsitem/elementtextitemgroup.h
    	sources/qetgraphicsitem/slaveelement.cpp
    	sources/qetgraphicsitem/slaveelement.h
    	sources/qetgraphicsitem/terminal.cpp
    	sources/qetgraphicsitem/terminal.h
    	sources/qetproject.cpp
    	sources/titleblockproperties.cpp

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


hooks/post-receive
-- 
qet/qet.git