Skip to content
Commit 9f5a0963 authored by Will Baker's avatar Will Baker
Browse files

Merge remote-tracking branch 'jlack1987/feature/fix_thruster_axis'



# Updated to use ignition::math::Vector3d
# Added axis arg to Thruster
# Conflicts:
#	uuv_gazebo_plugins/uuv_gazebo_plugins/src/ThrusterPlugin.cc

Signed-off-by: default avatarWill Baker <willcbaker@gmail.com>
parents f7260ae9 6228686c
Loading
Loading
Loading
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