Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

sot-pattern-generator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

318b6047

Commit 318b6047 authored 8 years ago by Rohan Budhiraja

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/devel'

Merge from stack-of-tasks/devel to proyan/master

Conflicts:
	src/pg.cpp

parents cb6e7cda 68cb3a85

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
include/sot-pattern-generator/pg.h 3 additions, 0 deletions

include/sot-pattern-generator/pg.h
private_cmake/config_private.hh.cmake 0 additions, 5 deletions

private_cmake/config_private.hh.cmake
src/CMakeLists.txt 5 additions, 1 deletion

src/CMakeLists.txt
src/dynamic_graph/sot/pattern_generator/walking.py 4 additions, 4 deletions

src/dynamic_graph/sot/pattern_generator/walking.py
src/pg.cpp 135 additions, 176 deletions

src/pg.cpp

with 148 additions and 187 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