Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/sdf15' into scpeters/state_1_12
Browse files Browse the repository at this point in the history
  • Loading branch information
scpeters committed Aug 28, 2024
2 parents 8521907 + d9b26df commit 107146b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if (BUILD_SDF)
gz_configure_project(
NO_PROJECT_PREFIX
REPLACE_INCLUDE_PATH sdf
VERSION_SUFFIX pre1)
VERSION_SUFFIX pre2)

#################################################
# Find tinyxml2.
Expand Down
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

1. **Baseline:** this includes all changes from 14.5.0 and earlier.

1. Fix symbol checking test when compiled with debug symbols
* [Pull request #1474](https://github.com/gazebosim/sdformat/pull/1474)

1. README: update badges for sdf15
* [Pull request #1472](https://github.com/gazebosim/sdformat/pull/1472)

Expand Down

0 comments on commit 107146b

Please sign in to comment.