Merge 3 to 4

Signed-off-by: Nate Koenig <nate@openrobotics.org>
gazebosim · Jan 13, 2021 · 20beaee · 20beaee
2 parents e9e9f19 + d5e65d9
commit 20beaee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -155,7 +155,25 @@
 
 ## Ignition Gazebo 3.x
 
-### Ignition Gazebo 3.X.X (20XX-XX-XX)
+### Ignition Gazebo 3.7.0 (2021-01-13)
+
+1. Fix examples in migration plugins tutorial.
+    * [Pull Request 543](https://github.com/ignitionrobotics/ign-gazebo/pull/543)
+
+1. Added missing namespace in `detail/EntityComponentManager.hh`.
+    * [Pull Request 541](https://github.com/ignitionrobotics/ign-gazebo/pull/541)
+
+1. Automatically load a subset of world plugins.
+    * [Pull Request 281](https://github.com/ignitionrobotics/ign-gazebo/pull/281)
+
+1. Update gtest to 1.10.0 for Windows compilation.
+    * [Pull Request 506](https://github.com/ignitionrobotics/ign-gazebo/pull/506)
+
+1. Updates to ardupilot migration tutorial.
+    * [Pull Request 525](https://github.com/ignitionrobotics/ign-gazebo/pull/525)
+
+1. Don't make docs on macOS.
+    * [Pull Request 528](https://github.com/ignitionrobotics/ign-gazebo/pull/528)
 
 ### Ignition Gazebo 3.6.0 (2020-12-30)
 

diff --git a/include/ignition/gazebo/detail/EntityComponentManager.hh b/include/ignition/gazebo/detail/EntityComponentManager.hh
@@ -32,6 +32,8 @@ namespace ignition
 {
 namespace gazebo
 {
+// Inline bracket to help doxygen filtering.
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 //////////////////////////////////////////////////
 namespace traits
 {
@@ -547,5 +549,6 @@ bool EntityComponentManager::RemoveComponent(Entity _entity)
 }
 }
 }
+}
 
 #endif