Revert "Removing 0.36.1"

CursedRock17 · CursedRock17 · commit a9f415f9b662 · 2024-04-03T21:17:36.000-04:00
This reverts commit 20fef74.
diff --git a/examples_tf2_py/CHANGELOG.rst b/examples_tf2_py/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package examples_tf2_py
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/examples_tf2_py/package.xml b/examples_tf2_py/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="2">
   <name>examples_tf2_py</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     Has examples of using the tf2 Python API.
   </description>
diff --git a/examples_tf2_py/setup.py b/examples_tf2_py/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version='0.36.0',
+    version='0.36.1',
     packages=[package_name],
     data_files=[
         ('share/ament_index/resource_index/packages',
diff --git a/geometry2/CHANGELOG.rst b/geometry2/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package geometry2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/geometry2/package.xml b/geometry2/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="2">
   <name>geometry2</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     A metapackage to bring in the default packages second generation Transform Library in ros, tf2.
   </description>
diff --git a/test_tf2/CHANGELOG.rst b/test_tf2/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package test_tf2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 * Adding addition BUILD_TESTING requirement (`#660 <https://github.com/ros2/geometry2/issues/660>`_)
 * Contributors: Lucas Wendland
 
diff --git a/test_tf2/package.xml b/test_tf2/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>test_tf2</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     tf2 unit tests
   </description>
diff --git a/tf2/CHANGELOG.rst b/tf2/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 * Nacho/minor fixes tf2 cache (`#658 <https://github.com/ros2/geometry2/issues/658>`_)
 * Removing console_bridge (`#655 <https://github.com/ros2/geometry2/issues/655>`_)
 * Contributors: Ignacio Vizzo, Lucas Wendland
diff --git a/tf2/package.xml b/tf2/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tf2</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     tf2 is the second generation of the transform library, which lets
     the user keep track of multiple coordinate frames over time. tf2
diff --git a/tf2_bullet/CHANGELOG.rst b/tf2_bullet/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_bullet
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_bullet/package.xml b/tf2_bullet/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>tf2_bullet</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     tf2_bullet
   </description>
diff --git a/tf2_eigen/CHANGELOG.rst b/tf2_eigen/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_eigen
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_eigen/package.xml b/tf2_eigen/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tf2_eigen</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>tf2_eigen</description>
 
   <maintainer email="alejandro@openrobotics.org">Alejandro Hernandez Cordero</maintainer>
diff --git a/tf2_eigen_kdl/CHANGELOG.rst b/tf2_eigen_kdl/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_eigen_kdl
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 * Fix installation directory of .dll files in tf2_eigen_kdl (`#657 <https://github.com/ros2/geometry2/issues/657>`_)
 * Contributors: Silvio Traversaro
 
diff --git a/tf2_eigen_kdl/package.xml b/tf2_eigen_kdl/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tf2_eigen_kdl</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
 
      Conversion functions between:
diff --git a/tf2_geometry_msgs/CHANGELOG.rst b/tf2_geometry_msgs/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_geometry_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_geometry_msgs/package.xml b/tf2_geometry_msgs/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>tf2_geometry_msgs</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     tf2_geometry_msgs
   </description>
diff --git a/tf2_kdl/CHANGELOG.rst b/tf2_kdl/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_kdl
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_kdl/package.xml b/tf2_kdl/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>tf2_kdl</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     KDL binding for tf2
   </description>
diff --git a/tf2_msgs/CHANGELOG.rst b/tf2_msgs/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_msgs/package.xml b/tf2_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>tf2_msgs</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     tf2_msgs
   </description>
diff --git a/tf2_py/CHANGELOG.rst b/tf2_py/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_py
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_py/package.xml b/tf2_py/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="2">
   <name>tf2_py</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>The tf2_py package</description>
 
   <maintainer email="alejandro@openrobotics.org">Alejandro Hernandez Cordero</maintainer>
diff --git a/tf2_ros/CHANGELOG.rst b/tf2_ros/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 * Adding NodeInterfaces to Buffer (`#656 <https://github.com/ros2/geometry2/issues/656>`_)
 * Reformat some code to make uncrustify happier. (`#654 <https://github.com/ros2/geometry2/issues/654>`_)
 * Contributors: Chris Lalancette, Lucas Wendland
diff --git a/tf2_ros/package.xml b/tf2_ros/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>tf2_ros</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     This package contains the C++ ROS bindings for the tf2 library
   </description>
diff --git a/tf2_ros_py/CHANGELOG.rst b/tf2_ros_py/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_ros_py
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_ros_py/package.xml b/tf2_ros_py/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>tf2_ros_py</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     This package contains the ROS Python bindings for the tf2 library
   </description>
diff --git a/tf2_ros_py/setup.py b/tf2_ros_py/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='0.36.0',
+    version='0.36.1',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/ament_index/resource_index/packages',
diff --git a/tf2_sensor_msgs/CHANGELOG.rst b/tf2_sensor_msgs/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_sensor_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_sensor_msgs/package.xml b/tf2_sensor_msgs/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>tf2_sensor_msgs</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     Small lib to transform sensor_msgs with tf. Most notably, PointCloud2
   </description>
diff --git a/tf2_tools/CHANGELOG.rst b/tf2_tools/CHANGELOG.rst
@@ -2,14 +2,9 @@
 Changelog for package tf2_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 0.36.1 (2024-03-28)
 -------------------
-=======
-Forthcoming
------------
->>>>>>> parent of 82b70f7 (0.36.1)
 
 =======
 >>>>>>> parent of 7150116 (Changelog.)
diff --git a/tf2_tools/package.xml b/tf2_tools/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="2">
   <name>tf2_tools</name>
-  <version>0.36.0</version>
+  <version>0.36.1</version>
   <description>
     tf2_tools
   </description>
diff --git a/tf2_tools/setup.py b/tf2_tools/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version='0.36.0',
+    version='0.36.1',
     packages=[package_name],
     data_files=[
         ('share/ament_index/resource_index/packages',
