[qet] [GIT] qet/qet.git branch XMLPropertiesNew created. 0.9-dev-45-ged8c1de

[<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, XMLPropertiesNew has been created
        at  ed8c1dea9dbc8cd3c224b3c0c66591f61e14cf9a (commit)

- Log -----------------------------------------------------------------
commit ed8c1dea9dbc8cd3c224b3c0c66591f61e14cf9a
Merge: 01d6cdb 28cd389
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Sun Feb 28 17:33:43 2021 +0100

    Merge commit '28cd389695248b56a99a417bc10640bb3e99c298'

commit 01d6cdb920f4bea4c985d1e7c6300b4aaff4bb29
Merge: f499507 77710e1
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Sat Feb 27 07:49:24 2021 +0100

    Merge commit '77710e1cc5e597d06196d2ee163198176032987a'
    
    Conflicts:
    	sources/conductorproperties.cpp
    	sources/qetgraphicsitem/element.cpp
    	sources/qetgraphicsitem/qetshapeitem.cpp

commit f499507b2d5f10734794945615b304766676f761
Author: Martin <martin.marmsoler@xxxxxxxxx>
Date:   Thu Feb 25 16:55:13 2021 +0100

    fix load issue

commit 543069235949f761033bfe900ac3b9294ef42814
Author: Martin <martin.marmsoler@xxxxxxxxx>
Date:   Wed Feb 24 19:04:14 2021 +0100

    remove not needed declaration, because the definition was already deleted. And so a linker error occured

commit 02b7ead041ab996ad9e2c3b83da399c4fdcd9ec9
Author: Martin <martin.marmsoler@xxxxxxxxx>
Date:   Wed Feb 24 18:48:59 2021 +0100

    fix compile issues

commit ea364f9c4e898033bdc1f60eeaf363fbeb7d71e5
Merge: b32a295 f97edad
Author: Martin <martin.marmsoler@xxxxxxxxx>
Date:   Tue Feb 23 17:35:55 2021 +0100

    merge

commit b32a295b0c29a558beb84acc2c979e9b146deb47
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Tue Oct 20 12:01:55 2020 +0200

    fix issue when creating xml document

commit 6251862f7aefdd41181f58d831c9a3c232f4b7af
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Mon Oct 19 21:22:00 2020 +0200

    default color was wrong

commit 793770a72af2443d0721c75988329c7467c993bd
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Mon Oct 19 20:02:29 2020 +0200

    initialize TerminalData with nullpoint to not having an invalid value

commit aba16dc9363f7aa88948e1a7159b5befc6af1f09
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Mon Oct 19 20:02:00 2020 +0200

    remove not needed variable

commit e5b8ba7e22a5fd6b0883db6e1b088ed1b77c3ad2
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Mon Oct 19 19:56:05 2020 +0200

    fix problems in partrectangle

commit dad32d5897f2d4f861ce181afb1cb4afc314b3dc
Author: Simon De Backer <simondebacker@xxxxxxx>
Date:   Mon Oct 19 16:56:09 2020 +0200

    Add destructor to Machine_info class to fix segfault

commit 9658a88c1849d0c3a8c9941489896d370369e221
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Mon Oct 19 11:07:04 2020 +0200

    fix compile issues

commit 12e301b887b64817ed81a20ca43fecf28c7bd9af
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date:   Sat Oct 17 20:25:30 2020 +0200

    replace 4 spaces by a tab

commit f3097fc537773d8eaab2591438ae686c54985fc5
Author: Martin Marmsoler <mmarmsoler@xxxxxxxxxxxxxxxxxxx>
Date:   Fri Oct 16 11:43:45 2020 +0200

    rebase XMLProperties_New (c0d9bf9) to master

commit 73b394527ddfa4606cf747829c7fb2638f93fd2a
Author: Martin Marmsoler <mmarmsoler@xxxxxxxxxxxxxxxxxxx>
Date:   Fri Oct 16 11:45:17 2020 +0200

    replace tabs by 4 spaces

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


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