Merge ign-launch1 ➡️ ign-launch2 (#184)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Jul 28, 2022 · 8fa03e3 · 8fa03e3
2 parents 5bc7537 + 977e487
commit 8fa03e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ ign_configure_project()
 # Set project-specific options
 #============================================================================
 
-set(IGN_LAUNCH_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/")
+set(IGN_LAUNCH_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/")
 
 #============================================================================
 # Search for project-specific dependencies

diff --git a/Changelog.md b/Changelog.md
@@ -50,7 +50,14 @@
 
 ## Ignition Launch 1.x
 
-### Ignition Launch 1.X.X (20XX-XX-XX)
+### Ignition Launch 1.10.1 (2020-12-23)
+
+1. Fix codecheck
+   * [Pull Request 67](https://github.com/ignitionrobotics/ign-launch/pull/67)
+   * [Pull Request 70](https://github.com/ignitionrobotics/ign-launch/pull/70)
+
+1. Fix race condition in websocket server
+   * [Pull Request 68](https://github.com/ignitionrobotics/ign-launch/pull/68)
 
 ### Ignition Launch 1.10.0 (2020-09-25)
 

diff --git a/api.md.in b/api.md.in
@@ -1,6 +1,6 @@
-## Ignition @IGN_DESIGNATION_CAP@
+## Ignition @GZ_DESIGNATION_CAP@
 
-Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
+Ignition @GZ_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
 designed to rapidly develop robot and simulation applications. 
 
 ## License

diff --git a/tutorials.md.in b/tutorials.md.in
@@ -1,8 +1,8 @@
 \page tutorials Tutorials
 
-Welcome to the Ignition @IGN_DESIGNATION_CAP@ tutorials. These tutorials
+Welcome to the Ignition @GZ_DESIGNATION_CAP@ tutorials. These tutorials
 will guide you through the process of understanding the capabilities of the
-Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
+Ignition @GZ_DESIGNATION_CAP@ library and how to use the library effectively.
 
 **Tutorials**