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

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

Merge branch 'develop' into feature/VECTO-238-look-ahead-coasting 

Conflicts:
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vecto
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.veng
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vgbx
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vveh
	VECTO/GUI/F_VECTO.Designer.vb
	VECTO/Input Files/cVECTO.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
parents 8e039c6e 0e7151ab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 152 additions and 26 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