[sdformat] 01/03: Merge tag 'upstream/2.0.1'

[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 585bfbcbf6ea8f054eac26751de0099959664372
Merge: 8c5469e e470d51
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 18 23:38:37 2014 +0000

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1

 .hg_archival.txt                                   |   4 +-
 .hgtags                                            |  20 +++
 CMakeLists.txt                                     |  21 ++-
 cmake/SearchForStuff.cmake                         |  26 +++-
 cmake/sdf_config.h.in                              |   1 +
 sdf/1.5/1_4.convert                                |  14 ++
 sdf/1.5/CMakeLists.txt                             |   2 +
 sdf/1.5/actor.sdf                                  |   6 +-
 sdf/1.5/forcetorque.sdf                            |  20 ++-
 sdf/1.5/geometry.sdf                               |   1 +
 sdf/1.5/joint.sdf                                  |  12 ++
 sdf/1.5/material.sdf                               |  48 +++++++
 sdf/1.5/polyline_shape.sdf                         |  14 ++
 sdf/1.5/road.sdf                                   |   3 +-
 sdf/1.5/sensor.sdf                                 |   2 +-
 sdf/1.5/visual.sdf                                 |  49 +------
 src/parser.cc                                      |   8 ++
 src/parser_urdf.cc                                 |   4 +-
 test/integration/CMakeLists.txt                    |   1 +
 test/integration/fixed_joint_reduction.cc          |  22 ++-
 test/integration/fixed_joint_reduction_visual.urdf | 151 +++++++++++++++++++++
 test/integration/plugin_attribute.cc               |  78 +++++++++++
 22 files changed, 439 insertions(+), 68 deletions(-)

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