[Fawkes Git] branch/common/master-merge-review: 30 revs updated. (0.5.0-3288-g98d05a4)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Aug 29 17:50:05 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/master-merge-review has been updated
        to  98d05a4e54e58f009aac9428eef4d534ef4767da (commit)
       via  cbe35a04a620ee8647a034d421a74384e08ec544 (commit)
       via  7487ef2b5efe76160032044e20d01e74c4c9e2c0 (commit)
       via  58ed958df78fca0f30619021741ad8c7e6e5e090 (commit)
       via  64eb9ea985d93855bd99e6178d96d111adeb21ae (commit)
       via  f139c25c46fa7331138c06e3f03c98d26e54fddd (commit)
       via  8203b8aa0f8fc75e8fdc95930a3472e3edb551e6 (commit)
       via  b94e86a36146a18e3472180c914b96df5ac63093 (commit)
       via  77fd7c78d8c1b37f8a30fb09ece662dd9daa9b33 (commit)
       via  17980ea5995aef126974c28f776fb956cdda92f1 (commit)
       via  bbef99de75a74cbe43d0338aca417e333fdbfa32 (commit)
       via  fceb82c6b91cfb6cf3372c14c9cf2fa1a02f46b2 (commit)
       via  f8cfee16cf6496b4fcbe29f8a11777a87b528b9f (commit)
       via  2c837e8d52635eefa0fa98906a4eca9b327def06 (commit)
       via  e182a2406c23746d5e02f7048898f191ec98945f (commit)
       via  07d84690843a1c94dda1fe82ab7bcb8cc8760da5 (commit)
       via  1e4d10050d29c9f2e623f67647dff45cbf786392 (commit)
       via  e2e80d65f3cc22a5be4a4d85467bc62a4b5ce174 (commit)
       via  54347c9a93e9feeef086b146c1ecf37322b8c4bf (commit)
       via  23c2811f98f3c7475eca5d52f4c0b31bed78e8ae (commit)
       via  13dbf1a89d55e14ff425e85bee5bbb6f322c5db4 (commit)
       via  d8dd277be5d6bf9c3c7273ebd0f3b02ccff12b6b (commit)
       via  fe212150494dade7ed8d98259d1e0ddb23358b88 (commit)
       via  fcee6f49c05bc46ecc06e6dd69ef0b50fa5895bf (commit)
       via  cd9130fa47d2d138c105850b4fa2cdabe0c937d7 (commit)
       via  8d11e44c56035791a22709e4baf503e9c4ef4c8b (commit)
       via  79b90f431b0a5953d45103016a0c26b2d5306c2f (commit)
       via  d1c49d53a80317d260e44af077ca782b522645f4 (commit)
       via  645221903bbb898a89606061af2a5820dca3fde2 (commit)
       via  83f3c3b44738f42d04f38639cd8e0059780743f9 (commit)
      from  6ad54fd34b26c846e4c80fa66e082e9b47c5318a (commit)

http://git.fawkesrobotics.org/fawkes.git/common/master-merge-review

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 7487ef2b5efe76160032044e20d01e74c4c9e2c0
Merge: 6ad54fd 58ed958
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Aug 29 16:46:23 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Aug 29 16:46:23 2016 +0200

    Merge remote-tracking branch 'origin/thofmann/gcc6'

http://git.fawkesrobotics.org/fawkes.git/commit/7487ef2
http://trac.fawkesrobotics.org/changeset/7487ef2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 98d05a4e54e58f009aac9428eef4d534ef4767da
Merge: 7487ef2 cbe35a0
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Aug 29 16:52:27 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Aug 29 16:52:27 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/motor-freeze'

http://git.fawkesrobotics.org/fawkes.git/commit/98d05a4
http://trac.fawkesrobotics.org/changeset/98d05a4

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


- *Summary* -----------------------------------------------------------
 src/libs/fvutils/ipc/shm_image.cpp                 |    4 ++--
 src/libs/fvwidgets/image_widget.cpp                |    2 +-
 src/libs/gui_utils/plugin_tree_view.cpp            |    8 ++++----
 src/libs/plugin/manager.cpp                        |    6 +++---
 src/libs/utils/system/dynamic_module/module.cpp    |    4 ++--
 src/libs/utils/system/fam.cpp                      |    8 ++++----
 src/plugins/bblogger/bblogreplay_plugin.cpp        |    2 +-
 src/plugins/clips/feature_config.cpp               |    2 +-
 src/plugins/dynamixel/dynamixel_plugin.cpp         |    4 ----
 src/plugins/imu/imu_plugin.cpp                     |    2 +-
 src/plugins/laser-cluster/laser-cluster-plugin.cpp |    2 +-
 src/plugins/laser-filter/filter_thread.cpp         |    4 ++--
 src/plugins/laser-filter/laser_filter_plugin.cpp   |    6 +++---
 src/plugins/laser/acquisition_thread.cpp           |    5 ++---
 src/plugins/laser/laser_plugin.cpp                 |    2 +-
 src/plugins/laser/urg_aqt.cpp                      |    2 +-
 src/plugins/laser/urg_gbx_aqt.cpp                  |    4 ++--
 src/plugins/mongodb/mongodb_thread.cpp             |    6 +++---
 .../mongodb_log/tools/ffmongodb_save_imgs.cpp      |    4 ----
 src/plugins/openni/depth_thread.cpp                |    4 ++--
 src/plugins/openni/handtracker_thread.cpp          |   12 ++++++------
 src/plugins/openni/image_thread.cpp                |    4 ++--
 src/plugins/openni/pointcloud_thread.cpp           |    8 ++++----
 src/plugins/openprs/mod_config.cpp                 |    4 ----
 .../perception/pcl-db/mongodb_tf_transformer.cpp   |    2 +-
 src/plugins/perception/pcl-db/pcl_db_pipeline.h    |    4 ++--
 src/plugins/robotino/act_thread.cpp                |    5 +++++
 src/plugins/robotino/act_thread.h                  |    1 +
 .../static_transforms/static_transforms_thread.cpp |    4 ----
 .../webview-ptzcam/webview-ptzcam-thread.cpp       |    4 ----
 src/tools/lasergui/lasergui.cpp                    |    4 ----
 src/tools/lasergui/lasergui_hildon.cpp             |    2 +-
 src/tools/plugin_gui/main.cpp                      |    2 +-
 src/tools/skillgui/skillgui.cpp                    |    2 +-
 src/tools/vision/firestation/main.cpp              |    2 +-
 src/tools/vision/fuse_viewer/main.cpp              |    2 +-
 36 files changed, 62 insertions(+), 81 deletions(-)


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

- *commit* 7487ef2b5efe76160032044e20d01e74c4c9e2c0 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Aug 29 16:46:23 2016 +0200
Subject: Merge remote-tracking branch 'origin/thofmann/gcc6'

 src/libs/fvutils/ipc/shm_image.cpp                 |    4 ++--
 src/libs/fvwidgets/image_widget.cpp                |    2 +-
 src/libs/gui_utils/plugin_tree_view.cpp            |    8 ++++----
 src/libs/plugin/manager.cpp                        |    6 +++---
 src/libs/utils/system/dynamic_module/module.cpp    |    4 ++--
 src/libs/utils/system/fam.cpp                      |    8 ++++----
 src/plugins/bblogger/bblogreplay_plugin.cpp        |    2 +-
 src/plugins/clips/feature_config.cpp               |    2 +-
 src/plugins/dynamixel/dynamixel_plugin.cpp         |    4 ----
 src/plugins/imu/imu_plugin.cpp                     |    2 +-
 src/plugins/laser-cluster/laser-cluster-plugin.cpp |    2 +-
 src/plugins/laser-filter/filter_thread.cpp         |    4 ++--
 src/plugins/laser-filter/laser_filter_plugin.cpp   |    6 +++---
 src/plugins/laser/acquisition_thread.cpp           |    5 ++---
 src/plugins/laser/laser_plugin.cpp                 |    2 +-
 src/plugins/laser/urg_aqt.cpp                      |    2 +-
 src/plugins/laser/urg_gbx_aqt.cpp                  |    4 ++--
 src/plugins/mongodb/mongodb_thread.cpp             |    6 +++---
 .../mongodb_log/tools/ffmongodb_save_imgs.cpp      |    4 ----
 src/plugins/openni/depth_thread.cpp                |    4 ++--
 src/plugins/openni/handtracker_thread.cpp          |   12 ++++++------
 src/plugins/openni/image_thread.cpp                |    4 ++--
 src/plugins/openni/pointcloud_thread.cpp           |    8 ++++----
 src/plugins/openprs/mod_config.cpp                 |    4 ----
 .../perception/pcl-db/mongodb_tf_transformer.cpp   |    2 +-
 src/plugins/perception/pcl-db/pcl_db_pipeline.h    |    4 ++--
 .../static_transforms/static_transforms_thread.cpp |    4 ----
 .../webview-ptzcam/webview-ptzcam-thread.cpp       |    4 ----
 src/tools/lasergui/lasergui.cpp                    |    4 ----
 src/tools/lasergui/lasergui_hildon.cpp             |    2 +-
 src/tools/plugin_gui/main.cpp                      |    2 +-
 src/tools/skillgui/skillgui.cpp                    |    2 +-
 src/tools/vision/firestation/main.cpp              |    2 +-
 src/tools/vision/fuse_viewer/main.cpp              |    2 +-
 34 files changed, 56 insertions(+), 81 deletions(-)

_Diff for modified files_:

- *commit* 98d05a4e54e58f009aac9428eef4d534ef4767da - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Aug 29 16:52:27 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/motor-freeze'

 src/plugins/robotino/act_thread.cpp |    5 +++++
 src/plugins/robotino/act_thread.h   |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list