Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)

Clone:  g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, common/current has been updated
        to  ba8ea8b0b6e271c33e516946a171d87e21046141 (commit)
       via  ec7a7167b471cbebd3ae28d1a882442126331e3f (commit)
      from  fdf25d0ba573a8a5905f4dc46fc206976a07c59b (commit)

http://git.fawkesrobotics.org/fawkes.git/common/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 ba8ea8b0b6e271c33e516946a171d87e21046141
Merge: fdf25d0 ec7a716
Author:     Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Thu Apr 12 10:59:42 2018 +0200
Commit:     Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Thu Apr 12 10:59:42 2018 +0200

    Merge remote-tracking branch 'origin/timn/webview-2.0' into common/current

http://git.fawkesrobotics.org/fawkes.git/commit/ba8ea8b
http://trac.fawkesrobotics.org/changeset/ba8ea8b

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


- *Summary* -----------------------------------------------------------
 src/plugins/skiller/Makefile                       |    6 +-----
 .../{pantilt => skiller}/interfaces/Makefile       |    6 +++---
 .../{ => interfaces}/SkillerDebugInterface.cpp     |    0
 .../{ => interfaces}/SkillerDebugInterface.h_ext   |    0
 .../{ => interfaces}/SkillerDebugInterface.tolua   |    0
 .../{ => interfaces}/SkillerDebugInterface.xml     |    0
 6 files changed, 4 insertions(+), 8 deletions(-)
 copy src/plugins/{pantilt => skiller}/interfaces/Makefile (81%)
 rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.cpp (100%)
 rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.h_ext (100%)
 rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.tolua (100%)
 rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.xml (100%)


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

- *commit* ba8ea8b0b6e271c33e516946a171d87e21046141 - - - - - - - - - -
Author:  Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:    Thu Apr 12 10:59:42 2018 +0200
Subject: Merge remote-tracking branch 'origin/timn/webview-2.0' into 
common/current

 src/plugins/skiller/Makefile                       |    6 +-----
 .../{pantilt => skiller}/interfaces/Makefile       |    6 +++---
 .../{ => interfaces}/SkillerDebugInterface.cpp     |    0
 .../{ => interfaces}/SkillerDebugInterface.h_ext   |    0
 .../{ => interfaces}/SkillerDebugInterface.tolua   |    0
 .../{ => interfaces}/SkillerDebugInterface.xml     |    0
 6 files changed, 4 insertions(+), 8 deletions(-)

_Diff for modified files_:




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org
_______________________________________________
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits

Reply via email to