[qet] [GIT] qet/qet.git branch master updated. 0.8-dev-590-g5ca7ff1

[<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, master has been updated
       via  5ca7ff177b8dfcab6b116fecd83bbb9098232e68 (commit)
       via  d5b7414b362257ecd4eab84ab1c017b2b2a0e2b2 (commit)
      from  34259a47499abb5731befaf0fab9858d96038770 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5ca7ff177b8dfcab6b116fecd83bbb9098232e68
Merge: d5b7414 34259a4
Author: Simon De Backer <simondebacker@xxxxxxx>
Date:   Thu Aug 13 22:56:40 2020 +0200

    Merge branch 'master'
    
    # Conflicts:
    #	sources/machine_info.cpp

commit d5b7414b362257ecd4eab84ab1c017b2b2a0e2b2
Author: Simon De Backer <simondebacker@xxxxxxx>
Date:   Thu Aug 13 22:50:58 2020 +0200

    Mod Machine_info
    
    add send_info_to_debug
    Mod get data PC
    send to debuger on startup

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

Summary of changes:
 sources/machine_info.cpp | 284 +++++++++++++++++++++++++++--------------------
 sources/machine_info.h   |  57 +++++++++-
 sources/main.cpp         |  23 ++--
 3 files changed, 227 insertions(+), 137 deletions(-)


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