Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

D

dynamic_graph_bridge
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

97396804

Commit 97396804 authored 8 years ago by Rohan Budhiraja

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/stack-of-tasks/dynamic_graph_bridge

Conflicts:
	CMakeLists.txt
	package.xml
	src/converter.hh
	src/geometric_simu.cpp

parents 4a0770c2 32c8feb9

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 12 additions, 5 deletions

CMakeLists.txt
include/dynamic_graph_bridge/sot_loader.hh 10 additions, 0 deletions

include/dynamic_graph_bridge/sot_loader.hh
src/converter.hh 7 additions, 4 deletions

src/converter.hh
src/geometric_simu.cpp 8 additions, 31 deletions

src/geometric_simu.cpp
src/ros_joint_state.cpp 1 addition, 1 deletion

src/ros_joint_state.cpp
src/ros_publish.hxx 0 additions, 1 deletion

src/ros_publish.hxx
src/ros_time.cpp 1 addition, 1 deletion

src/ros_time.cpp
src/sot_loader.cpp 63 additions, 3 deletions

src/sot_loader.cpp

with 102 additions and 46 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 sign in to comment