gazebo-classic:jrivero/11/tinyobj

Last commit made on 2020-11-23
Get this branch:
git clone -b jrivero/11/tinyobj https://git.launchpad.net/gazebo-classic

Branch merges

Branch information

Name:
jrivero/11/tinyobj
Repository:
lp:gazebo-classic

Recent commits

7367e38... by Louise Poubel <email address hidden>

Update TinyOBJLoader to v2.0.0rc8

Signed-off-by: Louise Poubel <email address hidden>

6fd426b... by Jose Luis Rivero

Merged in traversaro/gazebo-31/Silvio-Traversaro/ensure-that-the-ucrt-headers-are-include-1584292108645 (pull request #3202)

Ensure that the UCRT headers are included only if are found

Approved-by: Jose Luis Rivero <email address hidden>

646b319... by Steven Peters

Merged in merge_10_11 (pull request #3208)

Merge 10 -> 11

Approved-by: Steve Peters <email address hidden>

c53050d... by Steven Peters

Close branch merge_10_11

d636573... by Steve Peters <email address hidden>

10 -> 11

293ede8... by Steven Peters

Merged in merge_9_10_20200325 (pull request #3207)

Merge 9 -> 10

Approved-by: Steve Peters <email address hidden>

827cefc... by Steven Peters

Close branch merge_9_10_20200325

84489bb... by Steve Peters <email address hidden>

merge 9 -> 10

fc9870d... by Louise Poubel <email address hidden>

Merged in traversaro/gazebo-34/Silvio-Traversaro/add-workaround-for-ogre-issue-1499-see--1584875269408 (pull request #3205)

Add workaround for OGRE issue 1499 on Windows without pkg-config

Approved-by: Jose Luis Rivero <email address hidden>
Approved-by: Ian Chen <email address hidden>
Approved-by: Louise Poubel <email address hidden>

f37fe01... by Louise Poubel <email address hidden>

Merged in automoc_cmake_317_gazebo9 (pull request #3206)

Fix problem with automoc in CMake 3.17 (backport to gazebo9)

Approved-by: Shane Loretz <email address hidden>
Approved-by: Louise Poubel <email address hidden>