[Fawkes Git] branch/master: 9 revs updated. (0.5.0-3067-g95a6dd8)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Thu Jan 7 00:27:28 CET 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  95a6dd89b3b882db7cb90e98994b9362dd2fc54e (commit)
       via  72e4b768ac7a642bc774bc6ac4378e1295e94d94 (commit)
       via  88f267cec2575ddf18f909ded253f73c92637211 (commit)
       via  1660419ecad2614fb0aec5973ae37dc6c4c331f4 (commit)
       via  dcc9e4f715bf8fc2491f2809e05ff0acf4964c78 (commit)
       via  5d0dffd2bb41eb0cca42b68b02ab240c7a33b662 (commit)
       via  75e1161ff5d400fec46fe4492398f06a2f00a494 (commit)
       via  636b1131e007c39178f253c166c72e973851dbc7 (commit)
       via  9c505e9571b2bfffea5b582f50dd00a7104bf698 (commit)
      from  eb87fe3cbacda84d00e87082eb5f10786b44f2ba (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 88f267cec2575ddf18f909ded253f73c92637211
Merge: eb87fe3 1660419
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Tue Jan 5 16:31:49 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Jan 5 16:31:49 2016 +0100

    Merge remote-tracking branch 'origin/ggierse/ffswitch'

http://git.fawkesrobotics.org/fawkes.git/commit/88f267c
http://trac.fawkesrobotics.org/changeset/88f267c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 72e4b768ac7a642bc774bc6ac4378e1295e94d94
Merge: 88f267c 75e1161
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Tue Jan 5 16:32:13 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Jan 5 16:32:13 2016 +0100

    Merge remote-tracking branch 'origin/timn/pcl-shutup'

http://git.fawkesrobotics.org/fawkes.git/commit/72e4b76
http://trac.fawkesrobotics.org/changeset/72e4b76

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 95a6dd89b3b882db7cb90e98994b9362dd2fc54e
Merge: 72e4b76 dcc9e4f
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Tue Jan 5 16:32:33 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Jan 5 16:32:33 2016 +0100

    Merge remote-tracking branch 'origin/timn/ubuntu-trusty-fixes'

http://git.fawkesrobotics.org/fawkes.git/commit/95a6dd8
http://trac.fawkesrobotics.org/changeset/95a6dd8

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/pcl.yaml                     |   10 +++
 etc/buildsys/ros.mk                     |   10 ++-
 src/libs/aspect/inifins/pointcloud.cpp  |    8 ++-
 src/libs/aspect/inifins/pointcloud.h    |    2 +-
 src/libs/aspect/manager.cpp             |    2 +-
 src/libs/pcl_utils/utils.h              |   29 +++++++++
 src/plugins/mongodb/mongodb.mk          |   10 ++-
 src/tools/{config => ffswitch}/Makefile |   13 ++--
 src/tools/ffswitch/ffswitch.txt         |   57 +++++++++++++++++
 src/tools/ffswitch/main.cpp             |  103 +++++++++++++++++++++++++++++++
 10 files changed, 227 insertions(+), 17 deletions(-)
 create mode 100644 cfg/conf.d/pcl.yaml
 copy src/tools/{config => ffswitch}/Makefile (70%)
 create mode 100644 src/tools/ffswitch/ffswitch.txt
 create mode 100644 src/tools/ffswitch/main.cpp


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

- *commit* 88f267cec2575ddf18f909ded253f73c92637211 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Tue Jan 5 16:31:49 2016 +0100
Subject: Merge remote-tracking branch 'origin/ggierse/ffswitch'

 src/tools/{config => ffswitch}/Makefile |   13 ++--
 src/tools/ffswitch/ffswitch.txt         |   57 +++++++++++++++++
 src/tools/ffswitch/main.cpp             |  103 +++++++++++++++++++++++++++++++
 3 files changed, 167 insertions(+), 6 deletions(-)

_Diff for modified files_:

- *commit* 72e4b768ac7a642bc774bc6ac4378e1295e94d94 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Tue Jan 5 16:32:13 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/pcl-shutup'

 cfg/conf.d/pcl.yaml                    |   10 ++++++++++
 src/libs/aspect/inifins/pointcloud.cpp |    8 ++++++--
 src/libs/aspect/inifins/pointcloud.h   |    2 +-
 src/libs/aspect/manager.cpp            |    2 +-
 src/libs/pcl_utils/utils.h             |   29 +++++++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 4 deletions(-)

_Diff for modified files_:

- *commit* 95a6dd89b3b882db7cb90e98994b9362dd2fc54e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Tue Jan 5 16:32:33 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/ubuntu-trusty-fixes'

 etc/buildsys/ros.mk            |   10 +++++++---
 src/plugins/mongodb/mongodb.mk |   10 ++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list