[sdformat] 01/02: Merge tag 'upstream/3.6.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 fb06ca8bc0fea3d3dc2e3dde4bab1adc3eacec32
Merge: cf5addc 7d13819
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu Nov 12 15:47:42 2015 +0000

    Merge tag 'upstream/3.6.0'
    
    Upstream version 3.6.0

 .hg_archival.txt                                   |   6 +-
 .hgtags                                            |   7 +
 CMakeLists.txt                                     |   4 +-
 Changelog.md                                       |  17 ++
 cmake/DefaultCFlags.cmake                          |   4 +-
 cmake/SDFUtils.cmake                               |  63 ++++--
 cmake/SearchForStuff.cmake                         |  12 ++
 configure.bat                                      |   8 +-
 doc/header.html                                    |   2 +-
 doc/mainpage.html                                  |   8 +-
 include/sdf/Console.hh                             |   7 +-
 include/sdf/Element.hh                             |  21 +-
 include/sdf/Param.hh                               |   2 +-
 sdf/1.5/CMakeLists.txt                             |   6 +-
 sdf/1.5/battery.sdf                                |  12 ++
 sdf/1.5/camera.sdf                                 |  40 +++-
 sdf/1.5/light_state.sdf                            |  12 ++
 sdf/1.5/link.sdf                                   |   3 +-
 sdf/1.5/link_state.sdf                             |  46 ++++
 sdf/1.5/model.sdf                                  |   9 +-
 sdf/1.5/model_state.sdf                            |  38 ++++
 sdf/1.5/state.sdf                                  |  69 +-----
 sdf/1.5/surface.sdf                                |  60 +++++-
 src/Console.cc                                     |   2 +-
 src/Element.cc                                     |  91 ++++----
 src/Param.cc                                       |   5 +-
 src/SDF_TEST.cc                                    |  22 --
 src/parser.cc                                      |  18 +-
 test/integration/CMakeLists.txt                    |   6 +-
 .../cfm_damping_implicit_spring_damper.cc          |  27 ---
 test/integration/disable_fixed_joint_reduction.cc  |  15 --
 test/integration/element_memory_leak.cc            |  95 ++++++++
 test/integration/fixed_joint_reduction.cc          |  27 ---
 test/integration/force_torque_sensor.cc            |  14 --
 test/integration/joint_axis_frame.cc               |  27 ---
 test/integration/locale_fix.cc                     |  16 --
 test/integration/nested_model.cc                   | 238 +++++++++++++++++++++
 test/integration/parser_error_detection.cc         |  14 --
 test/integration/plugin_attribute.cc               |  14 --
 test/integration/plugin_bool.cc                    |  14 --
 test/integration/provide_feedback.cc               |  14 --
 test/integration/urdf_joint_parameters.cc          |  14 --
 tools/code_check.sh                                |   8 +-
 tools/get_mem_info.py                              |  12 ++
 44 files changed, 773 insertions(+), 376 deletions(-)

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