[Fawkes Git] branch/common/master-merge-review: 4 revs updated. (0.5.0-3338-g93a6598)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Sep 5 16:58:34 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  93a6598286f29e6a97c249d4749f0aa8fdc7674a (commit)
       via  ec22e5b04ba56b1a2645acad09cb8110a9abfba4 (commit)
       via  2fc3e0179fe94730f2fdd7dece56d0a39934834d (commit)
       via  22f0cd94ac277e5a12eafa4d96c30f4782b6567a (commit)
      from  7999eee33c24bf1edf652f5549227aa6f5157cff (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 2fc3e0179fe94730f2fdd7dece56d0a39934834d
Merge: 7999eee 22f0cd9
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 16:01:38 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 16:01:38 2016 +0200

    Merge remote-tracking branch 'origin/thofmann/skills-interface-ids'

http://git.fawkesrobotics.org/fawkes.git/commit/2fc3e01
http://trac.fawkesrobotics.org/changeset/2fc3e01

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit ec22e5b04ba56b1a2645acad09cb8110a9abfba4
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 16:34:34 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 16:34:34 2016 +0200

    config: remove unused old config file

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 93a6598286f29e6a97c249d4749f0aa8fdc7674a
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 16:36:10 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 16:36:10 2016 +0200

    config: remove unused old firevision field configs

http://git.fawkesrobotics.org/fawkes.git/commit/93a6598
http://trac.fawkesrobotics.org/changeset/93a6598

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


- *Summary* -----------------------------------------------------------
 cfg/firevision/fields/msl2007.field                |   25 --------------------
 cfg/firevision/fields/rwth-foyer-half.field        |   12 ---------
 cfg/firevision/fields/rwth-foyer.field             |   17 -------------
 cfg/modules.d/80_readylogagent.yaml                |   10 --------
 src/lua/skills/generic/advanced/katana_grab.lua    |    2 +-
 .../skills/generic/advanced/katana_grab_any.lua    |    2 +-
 src/lua/skills/generic/advanced/katana_put.lua     |    2 +-
 src/lua/skills/generic/goto.lua                    |    4 +-
 src/lua/skills/generic/jaco.lua                    |    6 ++--
 src/lua/skills/generic/jaco_bimanual.lua           |    2 +-
 src/lua/skills/generic/katana.lua                  |    2 +-
 src/lua/skills/generic/katana_approach.lua         |    2 +-
 src/lua/skills/generic/katana_rel.lua              |    2 +-
 src/lua/skills/generic/ppgoto.lua                  |    2 +-
 src/lua/skills/generic/relgoto.lua                 |    2 +-
 src/lua/skills/generic/transrot.lua                |    2 +-
 src/lua/skills/generic/turn.lua                    |    2 +-
 src/lua/skills/nao/getup.lua                       |    2 +-
 src/lua/skills/nao/led.lua                         |    4 +-
 src/lua/skills/nao/naorelgoto.lua                  |    4 +-
 src/lua/skills/nao/naostrafe.lua                   |    2 +-
 src/lua/skills/nao/park.lua                        |    4 +-
 src/lua/skills/nao/servo.lua                       |    6 ++--
 src/lua/skills/nao/soccer/kick.lua                 |    2 +-
 src/lua/skills/nao/standup.lua                     |    2 +-
 src/lua/skills/nao/stop.lua                        |    2 +-
 src/lua/skills/nao/walk.lua                        |    2 +-
 27 files changed, 31 insertions(+), 95 deletions(-)
 delete mode 100644 cfg/firevision/fields/msl2007.field
 delete mode 100644 cfg/firevision/fields/rwth-foyer-half.field
 delete mode 100644 cfg/firevision/fields/rwth-foyer.field
 delete mode 100644 cfg/modules.d/80_readylogagent.yaml


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

- *commit* 2fc3e0179fe94730f2fdd7dece56d0a39934834d - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 16:01:38 2016 +0200
Subject: Merge remote-tracking branch 'origin/thofmann/skills-interface-ids'

 src/lua/skills/generic/advanced/katana_grab.lua    |    2 +-
 .../skills/generic/advanced/katana_grab_any.lua    |    2 +-
 src/lua/skills/generic/advanced/katana_put.lua     |    2 +-
 src/lua/skills/generic/goto.lua                    |    4 ++--
 src/lua/skills/generic/jaco.lua                    |    6 +++---
 src/lua/skills/generic/jaco_bimanual.lua           |    2 +-
 src/lua/skills/generic/katana.lua                  |    2 +-
 src/lua/skills/generic/katana_approach.lua         |    2 +-
 src/lua/skills/generic/katana_rel.lua              |    2 +-
 src/lua/skills/generic/ppgoto.lua                  |    2 +-
 src/lua/skills/generic/relgoto.lua                 |    2 +-
 src/lua/skills/generic/transrot.lua                |    2 +-
 src/lua/skills/generic/turn.lua                    |    2 +-
 src/lua/skills/nao/getup.lua                       |    2 +-
 src/lua/skills/nao/led.lua                         |    4 ++--
 src/lua/skills/nao/naorelgoto.lua                  |    4 ++--
 src/lua/skills/nao/naostrafe.lua                   |    2 +-
 src/lua/skills/nao/park.lua                        |    4 ++--
 src/lua/skills/nao/servo.lua                       |    6 +++---
 src/lua/skills/nao/soccer/kick.lua                 |    2 +-
 src/lua/skills/nao/standup.lua                     |    2 +-
 src/lua/skills/nao/stop.lua                        |    2 +-
 src/lua/skills/nao/walk.lua                        |    2 +-
 23 files changed, 31 insertions(+), 31 deletions(-)

_Diff for modified files_:

- *commit* ec22e5b04ba56b1a2645acad09cb8110a9abfba4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 16:34:34 2016 +0200
Subject: config: remove unused old config file

 cfg/modules.d/80_readylogagent.yaml |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)


- *commit* 93a6598286f29e6a97c249d4749f0aa8fdc7674a - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 16:36:10 2016 +0200
Subject: config: remove unused old firevision field configs

 cfg/firevision/fields/msl2007.field         |   25 -------------------------
 cfg/firevision/fields/rwth-foyer-half.field |   12 ------------
 cfg/firevision/fields/rwth-foyer.field      |   17 -----------------
 3 files changed, 0 insertions(+), 54 deletions(-)





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


More information about the fawkes-commits mailing list