Commit 95fe8369 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

Merge tag 'v4.7.0'

Release of version 4.7.0.
parents 1d4655fe db756ffc
Pipeline #6166 failed with stages
in 2 minutes and 12 seconds
......@@ -24,7 +24,7 @@ SET(PROJECT_URL "")
SETUP_PROJECT()
FINDPYTHON(2.7 EXACT REQUIRED)
FINDPYTHON()
SET(URDF_UR_BENCHMARK_FILES
urdf/ur_benchmark/obstacles.urdf
......
Subproject commit 21b0f597d8953cd6d6daed1e377dd6c34fcef64b
Subproject commit 429af97fe0b858bd73a1747768cc1ac735386140
from common import robot, vf, ps, Ground, Box, Pokeball, PathPlayer, gripperName, ballName
from .common import robot, vf, ps, Ground, Box, Pokeball, PathPlayer, gripperName, ballName
......@@ -16,4 +16,4 @@
# hpp-universal-robot. If not, see
# <http://www.gnu.org/licenses/>.
from robot import Robot
from .robot import Robot
......@@ -16,4 +16,4 @@
# hpp-universal-robot. If not, see
# <http://www.gnu.org/licenses/>.
from robot import Robot
from .robot import Robot
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment