[sdformat] 02/02: Merge tag 'upstream/2.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 33baf8d7c5f8cbb3b6162edec6a5ea9a8f6ac355
Merge: 7f18f80 a0d4de9
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Fri Nov 21 00:41:40 2014 +0000

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0

 .hg_archival.txt                            |   6 +-
 .hgtags                                     |   1 +
 CMakeLists.txt                              |   4 +-
 sdf/1.4/physics.sdf                         |   7 ++
 sdf/1.5/CMakeLists.txt                      |   2 +
 sdf/1.5/camera.sdf                          |  22 ++++++
 sdf/1.5/gui.sdf                             |   3 +-
 sdf/1.5/magnetometer.sdf                    |   4 +
 sdf/1.5/physics.sdf                         |  13 +++-
 sdf/1.5/population.sdf                      |  60 +++++++++++++++
 sdf/1.5/sensor.sdf                          |  18 ++++-
 sdf/1.5/world.sdf                           |   2 +
 src/parser_urdf.cc                          |  13 ++++
 test/integration/CMakeLists.txt             |   2 +
 test/integration/force_torque_sensor.cc     |  64 ++++++++++++++++
 test/integration/force_torque_sensor.urdf   |  54 +++++++++++++
 test/integration/urdf_joint_parameters.cc   |  82 ++++++++++++++++++++
 test/integration/urdf_joint_parameters.urdf | 115 ++++++++++++++++++++++++++++
 18 files changed, 464 insertions(+), 8 deletions(-)

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