[Fawkes Git] branch/master: 6 revs updated. (0.5.0-3388-g70e0337)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Sep 7 23:15:17 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, master has been updated
        to  70e0337e952cc1cf6a359bfd437475371875d392 (commit)
       via  04512a55462d6afc3d00acfadecb0b0efef7aa3d (commit)
       via  55cd4f0b2311993341f1723b98b6d85cda524d06 (commit)
       via  c5d50752f402d871f34eeca552e1e127084053c1 (commit)
       via  23c909690f3afbdb45acd50403256bff43e47aed (commit)
       via  7c0eba1df1deadd4febafd3e43d514a3d3eaa429 (commit)
      from  540e6d2958d689d64b10691381b4b798e5925f81 (commit)

http://git.fawkesrobotics.org/fawkes.git/master

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 04512a55462d6afc3d00acfadecb0b0efef7aa3d
Merge: 540e6d2 23c9096
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 22:53:06 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 22:53:06 2016 +0200

    Merge remote-tracking branch 'origin/thofmann/recovery-of-cancelled-threads'

http://git.fawkesrobotics.org/fawkes.git/commit/04512a5
http://trac.fawkesrobotics.org/changeset/04512a5

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 70e0337e952cc1cf6a359bfd437475371875d392
Merge: 04512a5 55cd4f0
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 22:59:25 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 22:59:25 2016 +0200

    Merge remote-tracking branch 'origin/sschoenitz/timeout'

http://git.fawkesrobotics.org/fawkes.git/commit/70e0337
http://trac.fawkesrobotics.org/changeset/70e0337

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


- *Summary* -----------------------------------------------------------
 src/libs/core/threading/thread.cpp      |    2 ++
 src/libs/core/threading/thread_list.cpp |   18 +++++++++++-------
 src/lua/fawkes/fsm/jumpstate.lua        |   12 ++++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)


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

- *commit* 04512a55462d6afc3d00acfadecb0b0efef7aa3d - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 22:53:06 2016 +0200
Subject: Merge remote-tracking branch 'origin/thofmann/recovery-of-cancelled-threads'

 src/libs/core/threading/thread.cpp      |    2 ++
 src/libs/core/threading/thread_list.cpp |   18 +++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

_Diff for modified files_:

- *commit* 70e0337e952cc1cf6a359bfd437475371875d392 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 22:59:25 2016 +0200
Subject: Merge remote-tracking branch 'origin/sschoenitz/timeout'

 src/lua/fawkes/fsm/jumpstate.lua |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list