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

Skip to content
Snippets Groups Projects
Commit fd259142 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge branch 'develop' of... 

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-181-measured-speed-mode

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs
	VectoCore/Models/SimulationComponent/Impl/ManualGearbox.cs
parents 440699c3 45bd5860
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 614 additions and 379 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