[Fawkes Git] branch/common/master-merge-review: 18 revs updated. (0.5.0-3372-g20da726)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Tue Sep 6 20:39:38 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  20da72625cded9155c00b7120a597994819e2dd3 (commit)
       via  d99cf4d0ce53d1e5e43cb6d51d89c3b51dff5943 (commit)
       via  cce9990493f14f2737702c92b8f954c6ccdda85b (commit)
       via  11bab182b4b1f827a5d81593fc294a1d3db88187 (commit)
       via  cccd37c6fe2e6551b5672569b15f4dd2bfb06d01 (commit)
       via  b5a08f86909c04a9e064ec401434c56a630f9ff6 (commit)
       via  719b73418b66a30c5078d2fc099d27c68e06f101 (commit)
       via  f54c6b4bf01f4d5c926500e9217a3abc27b3de07 (commit)
       via  0aae62787a2df4dd2e207091ada38bb5f0f3d3ce (commit)
       via  03523ac3a19016c99edc39eac71cbd88d45ab865 (commit)
       via  e5ea7294da4275561aca720557a96f673d6551f2 (commit)
       via  64ee60bc7513ab1bba700775c72921ad81aa078e (commit)
       via  02fbcd8f2a846fc4a84416774290cb98849f7cf4 (commit)
       via  d80479bf70741fa8b9a4652e6962df492f68d6d7 (commit)
       via  d94736fb56c2df748be1662c225c285b854a565a (commit)
       via  e15601925acd43248c062a533b189b956383692b (commit)
       via  f258cb6ef63cac1855c35d51f4f1c16b0d5453b8 (commit)
       via  b93909cd299e6adc64df5ac11ba46f34b759f6b9 (commit)
      from  b060759f71d16bda5d7e0dc67b9fbcef541a4f2c (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 20da72625cded9155c00b7120a597994819e2dd3
Merge: b060759 d99cf4d
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Tue Sep 6 20:28:20 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Sep 6 20:28:20 2016 +0200

    Merge remote-tracking branch 'origin/jrothe/plugin_generator'

http://git.fawkesrobotics.org/fawkes.git/commit/20da726
http://trac.fawkesrobotics.org/changeset/20da726

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


- *Summary* -----------------------------------------------------------
 src/tools/{watchdog => plugin_generator}/Makefile |   31 +-
 src/tools/plugin_generator/ffgenplugin.txt        |   63 ++++
 src/tools/plugin_generator/main.cpp               |   96 +++++
 src/tools/plugin_generator/plugin_generator.cpp   |  397 +++++++++++++++++++++
 src/tools/plugin_generator/plugin_generator.h     |   70 ++++
 5 files changed, 645 insertions(+), 12 deletions(-)
 copy src/tools/{watchdog => plugin_generator}/Makefile (53%)
 create mode 100644 src/tools/plugin_generator/ffgenplugin.txt
 create mode 100644 src/tools/plugin_generator/main.cpp
 create mode 100644 src/tools/plugin_generator/plugin_generator.cpp
 create mode 100644 src/tools/plugin_generator/plugin_generator.h


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

- *commit* 20da72625cded9155c00b7120a597994819e2dd3 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Tue Sep 6 20:28:20 2016 +0200
Subject: Merge remote-tracking branch 'origin/jrothe/plugin_generator'

 src/tools/{watchdog => plugin_generator}/Makefile |   31 +-
 src/tools/plugin_generator/ffgenplugin.txt        |   63 ++++
 src/tools/plugin_generator/main.cpp               |   96 +++++
 src/tools/plugin_generator/plugin_generator.cpp   |  397 +++++++++++++++++++++
 src/tools/plugin_generator/plugin_generator.h     |   70 ++++
 5 files changed, 645 insertions(+), 12 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list