Code

Merge 10 -> 11 and resolve conflicts#734

Code

Merged

scpeters merged 3 commits intogazebosim:sdf11gazebosim/sdformat:sdf11from scpeters:merge_10_11scpeters/sdformat:merge_10_11Copy head branch name to clipboardOct 28, 2021

+72-1

Commits

Commits on Sep 9, 2021

• 🎈 10.6.0 (gazebosim#694)

  Show description for a55f9e3
  chapulina

  authored
  a55f9e3

  Copy full SHA for a55f9e3

Commits on Oct 15, 2021

• Check joint parent link names in Model::Load (gazebosim#726)

  Show description for aa9362b
  scpeters

  authored
  aa9362b

  Copy full SHA for aa9362b

• Merge branch 'sdf10' into merge_10_11

  scpeters

  committed
  c85a1b2

  Copy full SHA for c85a1b2