Merged in bump_8.7.0 (pull request gazebosim#633)

Bump to 8.7.0 Approved-by: Louise Poubel <lupoubel@hotmail.com>
kjeppesen1 · Dec 14, 2019 · dd27af7 · dd27af7
2 parents 30f8d51 + 92c4bd5
commit dd27af7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,8 +27,8 @@ project (sdformat8)
 set (SDF_PROTOCOL_VERSION 1.6)
 
 set (SDF_MAJOR_VERSION 8)
-set (SDF_MINOR_VERSION 6)
-set (SDF_PATCH_VERSION 1)
+set (SDF_MINOR_VERSION 7)
+set (SDF_PATCH_VERSION 0)
 
 set (SDF_VERSION ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION})
 set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION})

diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,18 @@
 1. Unversioned lib name for cmds
     * [Pull request 612](https://bitbucket.org/osrf/sdformat/pull-requests/612)
 
+1. Remove some URDF error messages
+    * [Pull request 605](https://bitbucket.org/osrf/sdformat/pull-requests/605)
+
+1. Fix parsing URDF without <material> inside <gazebo>
+    * [Pull request 608](https://bitbucket.org/osrf/sdformat/pull-requests/608)
+
+1. Backport URDF multiplication and linter
+    * [Pull request 632](https://bitbucket.org/osrf/sdformat/pull-requests/632)
+
+1. Add clipping for depth camera on rgbd camera sensor
+    * [Pull request 628](https://bitbucket.org/osrf/sdformat/pull-requests/628)
+
 ### SDFormat 8.6.0 (2019-11-20)
 
 1. configure.bat: use ign-math6, not gz11