Merge remote-tracking branch 'origin/master' (3e199df4) · 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

3e199df4

Commit 3e199df4 authored 5 years ago by

Jonas

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

parents a516fe69 f08ad904

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/var/FeatureModelConfigurator/configs/test.xml 30 additions, 0 deletions

src/var/FeatureModelConfigurator/configs/test.xml
src/var/FeatureModelConfigurator/modelOld.xml 0 additions, 34 deletions

src/var/FeatureModelConfigurator/modelOld.xml
src/var/FeatureModelConfigurator/resources/input/sensorconfig/other/lds_lfcd_sensor_BAD_RANGE.xml 35 additions, 0 deletions

...es/input/sensorconfig/other/lds_lfcd_sensor_BAD_RANGE.xml
src/var/FeatureModelConfigurator/resources/input/sensorconfig/other/lds_lfcd_sensor_GOOD_RANGE.xml 35 additions, 0 deletions

...s/input/sensorconfig/other/lds_lfcd_sensor_GOOD_RANGE.xml
src/var/FeatureModelConfigurator/resources/input/sensorconfig/other/lds_lfcd_sensor_HIGH_NOISE.xml 35 additions, 0 deletions

...s/input/sensorconfig/other/lds_lfcd_sensor_HIGH_NOISE.xml
src/var/usersetio.config 3 additions, 2 deletions

src/var/usersetio.config

with 138 additions and 36 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