From 554d032e554cfcfda3d1233ef0f385dc8475ae59 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <jspricke@debian.org>
Date: Thu, 26 May 2022 21:29:40 +0200
Subject: [PATCH 1/2] Add missing include

---
 src/rviz/pluginlib_factory.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rviz/pluginlib_factory.h b/src/rviz/pluginlib_factory.h
index 44fab90503..2027c284b3 100644
--- a/src/rviz/pluginlib_factory.h
+++ b/src/rviz/pluginlib_factory.h
@@ -43,6 +43,8 @@
 #include "rviz/class_id_recording_factory.h"
 #include "rviz/load_resource.h"
 
+#include <ros/console.h>
+
 namespace rviz
 {
 template <class Type>

From 14216a611d31a7abc2a02a192ae954fd79b3e684 Mon Sep 17 00:00:00 2001
From: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>
Date: Fri, 27 May 2022 21:15:52 +0200
Subject: [PATCH 2/2] 1.13.25

---
 CHANGELOG.rst | 8 ++++++++
 package.xml   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 61d7000100..7d8f2c1bd6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog for package rviz
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.13.25 (2022-05-27)
+--------------------
+* RobotLink: Simplify material mode handling (`#1732 <https://github.com/ros-visualization/rviz/issues/1732>`_)
+* Drop OGRE/ from #include directives (`#1730 <https://github.com/ros-visualization/rviz/issues/1730>`_)
+* Fix segfault when no tools are available (`#1729 <https://github.com/ros-visualization/rviz/issues/1729>`_)
+* GridCells: implement setTopic() (`#1722 <https://github.com/ros-visualization/rviz/issues/1722>`_)
+* Contributors: Brosong, Jochen Sprickerhof, Robert Haschke
+
 1.13.24 (2022-02-12)
 --------------------
 * Fix regression in mesh loader: correctly transform normals (`#1703 <https://github.com/ros-visualization/rviz/issues/1703>`_)
diff --git a/package.xml b/package.xml
index 0d527c4048..0499f046e0 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>rviz</name>
-  <version>1.13.24</version>
+  <version>1.13.25</version>
   <description>
      3D visualization tool for ROS.
   </description>