Merge branch 'master' of... (25c572c1) · Commits · Jonas Trappe / Semesterprojekt Modulbasiertes Testen · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Semesterprojekt Modulbasiertes Testen
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

25c572c1

Commit 25c572c1 authored 5 years ago by

pstolzenburg

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of https://gitlab.informatik.hu-berlin.de/trappejo/semesterprojekt-modulbasiertes-testen

parents 36927a34 8bc14d9c

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Varianten/AdapterFIDEROS/resources/input/.project 39 additions, 0 deletions

Varianten/AdapterFIDEROS/resources/input/.project
build/sim/bot.gazebo.xacro 3 additions, 84 deletions

build/sim/bot.gazebo.xacro
build/sim/bot.urdf.xacro 7 additions, 37 deletions

build/sim/bot.urdf.xacro
build/sim/botname.txt 1 addition, 1 deletion

build/sim/botname.txt
build/sim/log/location_monitor.log 1051 additions, 0 deletions

build/sim/log/location_monitor.log
src/var/FeatureModelConfigurator/configs/test.xml 8 additions, 8 deletions

src/var/FeatureModelConfigurator/configs/test.xml
src/var/FeatureModelConfigurator/features/ConfiguratorMain/Configurator.jak 1 addition, 1 deletion

...elConfigurator/features/ConfiguratorMain/Configurator.jak
src/var/FeatureModelConfigurator/resources/output/featuremodel.xml 2 additions, 2 deletions

...eatureModelConfigurator/resources/output/featuremodel.xml
src/var/FeatureModelConfigurator/src/Configurator.jak 4 additions, 14 deletions

src/var/FeatureModelConfigurator/src/Configurator.jak
src/var/FeatureModelConfigurator/src/Configurator.java 3 additions, 13 deletions

src/var/FeatureModelConfigurator/src/Configurator.java
src/var/FeatureModelImplGenerator/template/Main.jak 1 addition, 1 deletion

src/var/FeatureModelImplGenerator/template/Main.jak

with 1120 additions and 161 deletions

0% 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