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

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

Merge branch 'develop' into feature/VECTO-315-implement-at-gearbox-component

Conflicts:
	VECTO/GUI/F_GBX.vb
	VECTO/Input Files/cGBX.vb
	VECTO/cDeclaration.vb
	VectoCore/VectoCore/InputData/Reader/ComponentData/AuxiliaryDataReader.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/VectoCore/VectoCore.csproj
	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
parents 9ce766f5 c94bd33b
No related branches found
No related tags found
No related merge requests found
Showing
with 116859 additions and 290021 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment