Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 0d6f5720 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

Conflicts:
	VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
	VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
	VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
	VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
parents b9f107a5 cacb044f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about