Merge branch 'main' into yadu/docs

open-rmf · Dec 19, 2024 · c629f17 · c629f17
2 parents 62ca071 + 9c7747d
commit c629f17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/rmf_traffic/CHANGELOG.rst b/rmf_traffic/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rmf_traffic
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.4.0 (2024-06-12)
+------------------
+
 3.3.1 (2023-12-22)
 ------------------
 * Fix UB in plan squashing (`#106 <https://github.com/open-rmf/rmf_traffic/pull/106>`_)

diff --git a/rmf_traffic/package.xml b/rmf_traffic/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>rmf_traffic</name>
-  <version>3.3.1</version>
+  <version>3.4.0</version>
   <description>Package for managing traffic in the Robotics Middleware Framework</description>
   <maintainer email="[email protected]">Grey</maintainer>
   <maintainer email="[email protected]">Marco A. Gutiérrez</maintainer>

diff --git a/rmf_traffic_examples/CHANGELOG.rst b/rmf_traffic_examples/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rmf_traffic_examples
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.4.0 (2024-06-12)
+------------------
+
 3.3.1 (2023-12-22)
 ------------------
 

diff --git a/rmf_traffic_examples/package.xml b/rmf_traffic_examples/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>rmf_traffic_examples</name>
-  <version>3.3.1</version>
+  <version>3.4.0</version>
   <description>Examples of how to use the rmf_traffic library</description>
   <maintainer email="[email protected]">Grey</maintainer>
   <license>Apache License 2.0</license>