[sdformat] 01/01: Merge tag 'upstream/2.3.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 9eccb9c69c812d86371b31d5fbd0c14fe6481c0c
Merge: 87b4fc3 5b690a8
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Feb 4 02:32:23 2015 +0100

    Merge tag 'upstream/2.3.0'
    
    Upstream version 2.3.0

 .hg_archival.txt                                   |    6 +-
 .hgtags                                            |    2 +
 CMakeLists.txt                                     |   65 +-
 Changelog.md                                       |   40 +
 INSTALL_WIN32.md                                   |   46 +
 cmake/SDFUtils.cmake                               |   63 +-
 cmake/SearchForStuff.cmake                         |   66 +-
 cmake/sdf_config.h.in                              |    2 +-
 configure.bat                                      |    4 +
 include/sdf/Param.hh                               |   26 +-
 include/sdf/SDFImpl.hh                             |    2 +
 sdf/1.4/physics.sdf                                |    4 +-
 sdf/1.4/world.sdf                                  |    7 +
 sdf/1.5/CMakeLists.txt                             |   25 +-
 sdf/1.5/link.sdf                                   |    6 +-
 sdf/1.5/material.sdf                               |    1 -
 sdf/1.5/model.sdf                                  |   19 +
 sdf/1.5/physics.sdf                                |    4 +-
 sdf/1.5/schema/types.xsd                           |   44 +
 sdf/1.5/world.sdf                                  |   20 +-
 src/CMakeLists.txt                                 |   32 +-
 src/Param_TEST.cc                                  |   64 +
 src/SDF.cc                                         |    6 +
 src/parser.cc                                      |   13 +-
 src/parser_urdf.cc                                 |  200 +-
 src/urdf/urdf_model/link.h                         |   51 +-
 src/urdf/urdf_model/model.h                        |    6 +-
 src/urdf/urdf_model/pose.h                         |    2 +-
 src/urdf/urdf_parser/link.cpp                      |  126 +-
 src/urdf/urdf_parser/model.cpp                     |   85 +-
 src/urdf/urdf_world/world.h                        |    2 +-
 src/win/tinyxml/VERSION_2.6.2                      |    2 +
 src/win/tinyxml/tinystr.cpp                        |  111 +
 src/win/tinyxml/tinystr.h                          |  305 ++
 src/win/tinyxml/tinyxml.cpp                        | 1863 ++++++++++++
 src/win/tinyxml/tinyxml.h                          | 1805 ++++++++++++
 src/win/tinyxml/tinyxmlerror.cpp                   |   52 +
 src/win/tinyxml/tinyxmlparser.cpp                  | 1640 +++++++++++
 test/CMakeLists.txt                                |    4 +
 test/integration/CMakeLists.txt                    |    6 +
 test/integration/disable_fixed_joint_reduction.cc  |   80 +
 test/integration/fixed_joint_reduction.cc          |   49 +
 test/integration/fixed_joint_reduction.urdf        |   42 +
 ...n.urdf => fixed_joint_reduction_collision.urdf} |   30 +-
 ...on.urdf => fixed_joint_reduction_disabled.urdf} |    5 +-
 test/integration/model/double_pendulum.sdf         |  204 ++
 test/integration/model/pr2.sdf                     | 3036 ++++++++++++++++++++
 test/integration/model/turtlebot.sdf               |  474 +++
 test/integration/plugin_bool.cc                    |   76 +
 test/integration/schema_test.cc                    |   70 +
 test/test_config.h.in                              |   24 +
 tools/xmlschema.rb                                 |  302 ++
 52 files changed, 10935 insertions(+), 284 deletions(-)

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