Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Axii
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c921df51

Commit c921df51 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'main' of gitlab.com:ArmarX/meta/setup into main

parents 92a8fa9c 507c4b0f

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

data/modules/apt/_other.json 0 additions, 2 deletions

data/modules/apt/_other.json
data/modules/apt/blas.json 4 additions, 1 deletion

data/modules/apt/blas.json
data/modules/armarx/RobotComponents.json 2 additions, 1 deletion

data/modules/armarx/RobotComponents.json
data/modules/armarx_integration/robot_devices.json 28 additions, 0 deletions

data/modules/armarx_integration/robot_devices.json
data/modules/armarx_integration/robots/armar6/rt.json 2 additions, 1 deletion

data/modules/armarx_integration/robots/armar6/rt.json
data/modules/simox.json 4 additions, 1 deletion

data/modules/simox.json

with 40 additions and 6 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