BRSRI/bellande_humanoid_robot_intelligence_control_system_architecture
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ROBOTIS-GIT/ROBOTIS-OP3-Demo into develop

Browse Source 
# Conflicts:
#	op3_demo/CMakeLists.txt
This commit is contained in:
Kayman 2017-10-11 17:18:02 +09:00
commit 707e3c5b20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
op3_demo/CMakeLists.txt
View File

@ -120,4 +120,4 @@ target_link_libraries(self_test_node
################################################################################
# Test
################################################################################
################################################################################

6
op3_demo/package.xml
View File

@ -10,7 +10,7 @@
<author email="kmjung@robotis.com">kayman</author>
<maintainer email="pyo@robotis.com">Pyo</maintainer>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
<build_depend>roslib</build_depend>
<build_depend>sensor_msgs</build_depend>
@ -19,7 +19,7 @@
<build_depend>op3_walking_module_msgs</build_depend>
<build_depend>op3_action_module_msgs</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>robotis_math</build_depend>
<build_depend>robotis_math</build_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
<run_depend>sensor_msgs</run_depend>
@ -29,4 +29,4 @@
<run_depend>op3_action_module_msgs</run_depend>
<run_depend>cmake_modules</run_depend>
<run_depend>robotis_math</run_depend>
</package>
</package>