[Fawkes Git] branch/common/caro-current: 8 revs updated. (0.5.0-3172-g2b5441c)

Frederik Zwilling zwilling at kbsg.rwth-aachen.de
Tue Jun 21 18:25:03 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, common/caro-current has been updated
        to  2b5441c23331af3ab626bf1f707216853815708e (commit)
       via  6571efe7b5abf889137e5ba46513a4fde5f36b52 (commit)
       via  d022bd332531762b28e5a25eaa5b1f2763c7e495 (commit)
       via  a7368717c6becd8e146261a2143d04c6eff14ddf (commit)
       via  11850b75b65468ccae033b9a1768fe43f3d113f3 (commit)
       via  7aae7cfbde27ae218844cd12e6f0e0555c0dfa5c (commit)
       via  19970f50261fb8052a832d0a95a0ec37afd6d1e4 (commit)
       via  f5a95e9a498db4c4230084d0555de7a20bbb1d82 (commit)
      from  f1d853ef23a663a129350efd7bc2a095b2fe6375 (commit)

http://git.fawkesrobotics.org/fawkes.git/common/caro-current

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 6571efe7b5abf889137e5ba46513a4fde5f36b52
Merge: f1d853e d022bd3
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Mon Jun 20 11:00:33 2016 +0200
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Mon Jun 20 11:00:33 2016 +0200

    Merge remote-tracking branch 'origin/timn/robotino-direct' into common/caro-current

http://git.fawkesrobotics.org/fawkes.git/commit/6571efe
http://trac.fawkesrobotics.org/changeset/6571efe

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 2b5441c23331af3ab626bf1f707216853815708e
Merge: 6571efe 19970f5
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Mon Jun 20 11:52:30 2016 +0200
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Mon Jun 20 11:52:30 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/mps-align' into common/caro-current

http://git.fawkesrobotics.org/fawkes.git/commit/2b5441c
http://trac.fawkesrobotics.org/changeset/2b5441c

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/robotino.yaml                    |   10 +++
 src/lua/fawkes/laser-lines_utils.lua        |    9 +++
 src/lua/fawkes/tfutils.lua                  |   81 ++++++++++++++++++++++----
 src/plugins/robotino/direct_com_message.cpp |   21 ++++++-
 src/plugins/robotino/direct_com_message.h   |    9 +++
 src/plugins/robotino/direct_com_thread.cpp  |   27 +++++++++
 src/plugins/robotino/direct_com_thread.h    |    6 ++-
 7 files changed, 147 insertions(+), 16 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 6571efe7b5abf889137e5ba46513a4fde5f36b52 - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Mon Jun 20 11:00:33 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/robotino-direct' into common/caro-current

 cfg/conf.d/robotino.yaml                    |   10 ++++++++++
 src/plugins/robotino/direct_com_message.cpp |   21 +++++++++++++++++++--
 src/plugins/robotino/direct_com_message.h   |    9 +++++++++
 src/plugins/robotino/direct_com_thread.cpp  |   27 +++++++++++++++++++++++++++
 src/plugins/robotino/direct_com_thread.h    |    6 +++++-
 5 files changed, 70 insertions(+), 3 deletions(-)

_Diff for modified files_:

- *commit* 2b5441c23331af3ab626bf1f707216853815708e - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Mon Jun 20 11:52:30 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/mps-align' into common/caro-current

 src/lua/fawkes/laser-lines_utils.lua |    9 ++++
 src/lua/fawkes/tfutils.lua           |   81 ++++++++++++++++++++++++++++-----
 2 files changed, 77 insertions(+), 13 deletions(-)

_Diff for modified files_:




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list