Skip to content
Snippets Groups Projects
Commit 4e8f5193 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'Ubuntu18.04' into mjcf

# Conflicts:
#	VirtualRobot/XML/mjcf/MujocoIO.cpp
#	VirtualRobot/XML/mujoco/MujocoIO.h
parents ac4fce51 7cdc6727
No related branches found
No related tags found
No related merge requests found
Showing
with 183 additions and 172 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment