Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c38582f8

Commit c38582f8 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

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

parents c08294db b2aa2c87

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

README.md 32 additions, 3 deletions

README.md
armarx_setup/cli/workspace.py 1 addition, 1 deletion

armarx_setup/cli/workspace.py
data/modules/armarx-minimal.json 15 additions, 0 deletions

data/modules/armarx-minimal.json
data/modules/armarx/ArmarXCore.json 1 addition, 1 deletion

data/modules/armarx/ArmarXCore.json
data/modules/armarx/ArmarXGui.json 1 addition, 1 deletion

data/modules/armarx/ArmarXGui.json
data/modules/armarx/tutorials.json 0 additions, 0 deletions

data/modules/armarx/tutorials.json
data/modules/mmm/core.json 3 additions, 1 deletion

data/modules/mmm/core.json

with 53 additions and 7 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