Merge branch 'main' into mjcarroll/drop_vendor_tinyxml2

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
gazebosim · Oct 28, 2023 · 04765c3 · 04765c3
2 parents 6c13100 + 7d88e7f
commit 04765c3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -1 +1 @@
-http://ignition_robotics.org
+http://gazebosim.org
diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc
@@ -55,7 +55,7 @@ class AssimpLoader::Implementation
   /// \brief the Assimp importer used to parse meshes
   public: Assimp::Importer importer;
 
-  /// \brief Convert a color from assimp implementation to Ignition common
+  /// \brief Convert a color from assimp implementation to Gazebo common
   /// \param[in] _color the assimp color to convert
   /// \return the matching math::Color
   public: math::Color ConvertColor(aiColor4D& _color) const;

diff --git a/src/Filesystem_TEST.cc b/src/Filesystem_TEST.cc
@@ -357,8 +357,8 @@ TEST_F(FilesystemTest, append)
 #endif
 
   // Make sure that the slashes in the middle of string are not altered.
-  path = joinPaths("https://fuel.ignitionrobotics.org", "/models", "box");
-  EXPECT_EQ(path, "https://fuel.ignitionrobotics.org/models/box");
+  path = joinPaths("https://fuel.gazebosim.org", "/models", "box");
+  EXPECT_EQ(path, "https://fuel.gazebosim.org/models/box");
 }
 
 /////////////////////////////////////////////////

diff --git a/tutorials/profiler.md b/tutorials/profiler.md
@@ -63,7 +63,7 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 find_package(gz-common6 QUIET REQUIRED COMPONENTS profiler)
 
 add_executable(profiler_example profiler.cc)
-target_link_libraries(profiler_example ignition-common6::profiler)
+target_link_libraries(profiler_example gz-common6::profiler)
 # Enable the profiler for the example
 target_compile_definitions(profiler_example PUBLIC "GZ_PROFILER_ENABLE=1")
 ```