[sdformat] 01/02: Merge tag 'upstream/4.2.0'

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository sdformat.

commit c6ab20bcaff0bb777b1fe08252bf51c89df5de13
Merge: c2d2fa8 5508763
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Jan 17 16:52:13 2017 +0000

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0

 .hg_archival.txt                                   |  8 +--
 .hgtags                                            |  1 +
 CMakeLists.txt                                     |  4 +-
 Changelog.md                                       | 10 ++-
 include/sdf/SDFExtension.hh                        |  1 +
 sdf/1.6/imu.sdf                                    | 79 ++++++++++++++++++++++
 sdf/1.6/spherical_coordinates.sdf                  | 24 ++++++-
 src/SDFExtension.cc                                |  1 +
 src/parser_urdf.cc                                 |  9 +--
 test/integration/fixed_joint_reduction.cc          |  2 +
 ..._joint_reduction_collision_visual_extension.sdf |  1 -
 11 files changed, 126 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git