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

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
Source project has a limited visibility.
Markus QUARITSCH's avatar
Markus Quaritsch authored
Merge branch 'feature/VECTO-1143-extending-segmentation-table-for-medium-lorries' into feature/VECTO-1190-declaration-mode-for-heavy-buses

# Conflicts:
#	VECTO/GUI/GearboxForm.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/OutputData/JSONFileWriter.vb
#	VectoCommon/VectoCommon/Models/VehicleCategory.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
#	VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
#	VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
#	VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
#	VectoCore/VectoCore/Resources/Declaration/CO2Standards/WeightingGroups.csv
#	VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
43cb5107
History
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
Name Last commit Last update
..