[Fawkes Git] branch/bschaepers/asp-aspect: 10 revs updated. (0.5.0-3447-ga4ccf79)

Bjoern Schaepers bjoern.schaepers at rwth-aachen.de
Wed Nov 2 09:51:56 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, bschaepers/asp-aspect has been updated
        to  a4ccf792f7e8aa2dc56b7b8aec681433d25b9113 (commit)
       via  b5129ebacf6dce2c52b1e6483a8e55648f76fb1c (commit)
       via  eda2a2b2116e9d1baf13c8364ef2d703d7911f26 (commit)
       via  c28d7b925e67ec47329d510df1d4896727053c6c (commit)
       via  9bbb7d0fb36d3656705cd8a3585fd5c189fad419 (commit)
       via  c48b00b4b60d243ac6b337c5e9f717624776ae98 (commit)
       via  c0e0eb609971d97d877d7b830ac29950d1da0174 (commit)
       via  b55e7a4b2dd2d6c314af32a01262a3198592dd8e (commit)
       via  2aaa72883c92b3546832be60e12273b229cd5676 (commit)
       via  535c50e06d3b76bca66b069f3591cb21cd4f4795 (commit)
      from  36920462f64b4f5aae158ce8f0b2fa9ccac69944 (commit)

http://git.fawkesrobotics.org/fawkes.git/bschaepers/asp-aspect

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 a4ccf792f7e8aa2dc56b7b8aec681433d25b9113
Merge: 3692046 b5129eb
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Tue Nov 1 14:49:05 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Tue Nov 1 14:49:05 2016 +0100

    Merge remote-tracking branch 'origin/fzwilling/sub_process' into bschaepers/asp-aspect

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

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


- *Summary* -----------------------------------------------------------
 src/libs/utils/Makefile                            |   40 ++++++++++++++++++--
 .../utils/misc/string_commands.cpp}                |    3 +-
 .../string.h => libs/utils/misc/string_commands.h} |    6 +-
 .../utils => libs/utils/sub_process}/proc.cpp      |    0
 .../utils => libs/utils/sub_process}/proc.h        |    0
 src/plugins/colli/search/astar.cpp                 |   20 +++++-----
 src/plugins/colli/search/astar.h                   |    6 +-
 src/plugins/colli/search/astar_search.cpp          |    2 +-
 src/plugins/colli/search/astar_search.h            |    4 +-
 .../openprs/aspect/openprs_kernel_manager.cpp      |    4 +-
 10 files changed, 59 insertions(+), 26 deletions(-)
 rename src/{plugins/openprs/utils/string.cpp => libs/utils/misc/string_commands.cpp} (98%)
 rename src/{plugins/openprs/utils/string.h => libs/utils/misc/string_commands.h} (90%)
 rename src/{plugins/openprs/utils => libs/utils/sub_process}/proc.cpp (100%)
 rename src/{plugins/openprs/utils => libs/utils/sub_process}/proc.h (100%)


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

- *commit* a4ccf792f7e8aa2dc56b7b8aec681433d25b9113 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Tue Nov 1 14:49:05 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/sub_process' into bschaepers/asp-aspect

 src/libs/utils/Makefile                            |   40 ++++++++++++++++++--
 .../utils/misc/string_commands.cpp}                |    3 +-
 .../string.h => libs/utils/misc/string_commands.h} |    6 +-
 .../utils => libs/utils/sub_process}/proc.cpp      |    0
 .../utils => libs/utils/sub_process}/proc.h        |    0
 src/plugins/colli/search/astar.cpp                 |   20 +++++-----
 src/plugins/colli/search/astar.h                   |    6 +-
 src/plugins/colli/search/astar_search.cpp          |    2 +-
 src/plugins/colli/search/astar_search.h            |    4 +-
 .../openprs/aspect/openprs_kernel_manager.cpp      |    4 +-
 10 files changed, 59 insertions(+), 26 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list