Skip to content

Commit 23d815b

Browse files
authored
Merge branch 'ros2:rolling' into patch-8
2 parents 680f21c + be68734 commit 23d815b

File tree

235 files changed

+484
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+484
-89
lines changed

.github/workflows/mirror-rolling-to-ros2.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

CODEOWNERS

Lines changed: 0 additions & 2 deletions
This file was deleted.

rviz2/CHANGELOG.rst

Lines changed: 9 additions & 0 deletions

rviz2/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
schematypens="http://www.w3.org/2001/XMLSchema"?>
55
<package format="2">
66
<name>rviz2</name>
7-
<version>14.3.1</version>
7+
<version>14.4.0</version>
88
<description>
99
3D visualization tool for ROS.
1010
</description>

rviz_assimp_vendor/CHANGELOG.rst

Lines changed: 9 additions & 0 deletions

rviz_assimp_vendor/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
schematypens="http://www.w3.org/2001/XMLSchema"?>
55
<package format="2">
66
<name>rviz_assimp_vendor</name>
7-
<version>14.3.1</version>
7+
<version>14.4.0</version>
88
<description>
99
Wrapper around assimp, providing nothing but a dependency on assimp, on some systems.
1010
On others, it provides a fixed CMake module or even an ExternalProject build of assimp.

rviz_common/CHANGELOG.rst

Lines changed: 13 additions & 0 deletions

rviz_common/include/rviz_common/display.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
#include <QIcon> // NOLINT: cpplint is unable to handle the include order here
3838
#include <QSet> // NOLINT: cpplint is unable to handle the include order here
39+
#include <QString> // NOLINT: cpplint is unable to handle the include order here
3940

4041
#include "rclcpp/time.hpp"
4142

rviz_common/include/rviz_common/display_group.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#ifndef RVIZ_COMMON__DISPLAY_GROUP_HPP_
3333
#define RVIZ_COMMON__DISPLAY_GROUP_HPP_
3434

35+
#include <QString>
36+
3537
#include "rviz_common/display.hpp"
3638
#include "rviz_common/visibility_control.hpp"
3739

rviz_common/include/rviz_common/factory/class_id_recording_factory.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#ifndef RVIZ_COMMON__FACTORY__CLASS_ID_RECORDING_FACTORY_HPP_
3333
#define RVIZ_COMMON__FACTORY__CLASS_ID_RECORDING_FACTORY_HPP_
3434

35+
#include <QString>
36+
3537
#include "./factory.hpp"
3638

3739
namespace rviz_common

0 commit comments

Comments
 (0)