Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
4f235f85
Commit
4f235f85
authored
4 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/Armar6Demo'
parents
aa6f304d
7d705895
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
+11
-11
11 additions, 11 deletions
...API/components/DynamicObstacleManager/ManagedObstacle.cpp
source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
+3
-1
3 additions, 1 deletion
source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
with
14 additions
and
12 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
