[sdformat] 02/03: Merge tag 'upstream/4.3.2'
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Tue Sep 5 18:59:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository sdformat.
commit acd234b4c47a7cfccf60a5ce4f1e59536f8ce701
Merge: 748e94e 336ccc9
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Tue Sep 5 20:58:53 2017 +0200
Merge tag 'upstream/4.3.2'
Upstream version 4.3.2
.hg_archival.txt | 8 +-
.hgtags | 3 +
CMakeLists.txt | 36 ++---
Changelog.md | 56 ++++++-
Migration.md | 12 ++
cmake/CodeCoverage.cmake | 132 +++++++++++++++
cmake/DefaultCFlags.cmake | 32 ++--
cmake/sdf_config.cmake.in | 4 +
include/sdf/Element.hh | 24 +++
include/sdf/Exception.hh | 4 +
include/sdf/Param.hh | 2 +
include/sdf/parser.hh | 17 ++
include/sdf/parser_urdf.hh | 2 +-
sdf/1.6/heightmap_shape.sdf | 4 +
sdf/1.6/physics.sdf | 14 ++
sdf/1.6/state.sdf | 7 +-
sdf/1.6/surface.sdf | 4 +
Migration.md => sdf/Migration.md | 82 +++++-----
src/Exception.cc | 11 +-
src/Param_TEST.cc | 8 +
src/SDF_TEST.cc | 2 +-
src/parser.cc | 179 ++++++++++++++-------
test/integration/CMakeLists.txt | 3 +
test/integration/category_bitmask.cc | 110 +++++++++++++
test/integration/disable_fixed_joint_reduction.cc | 2 +-
test/integration/joint_axis_frame.cc | 2 +-
test/integration/model/cococan/model-100.sdf | 25 +++
test/integration/model/cococan/model-1_2.sdf | 25 +++
test/integration/model/cococan/model-1_4.sdf | 25 +++
test/integration/model/cococan/model.config | 17 ++
.../model/cococan_malformed/model.config | 14 ++
.../model/cococan_noversiontag/model-1_2.sdf | 25 +++
.../model/cococan_noversiontag/model-1_4.sdf | 25 +++
.../model/cococan_noversiontag/model.config | 16 ++
test/integration/model_versions.cc | 75 +++++++++
test/integration/plugin_bool.cc | 8 +
test/integration/plugin_include.cc | 98 +++++++++++
tools/get_mem_info.py | 2 +-
38 files changed, 970 insertions(+), 145 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git
More information about the debian-science-commits
mailing list