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
    72fb9634
    Merge branch 'develop' of... · 72fb9634
    Markus Quaritsch authored
    Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-1073-support-for-dual-fuel-engines
    
    # Conflicts:
    #	HashingTool/Properties/Version.cs
    #	VectoCommon/VectoCommon/Properties/Version.cs
    #	VectoCommon/VectoHashing/Properties/Version.cs
    #	VectoConsole/Properties/Version.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
    #	VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
    #	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
    #	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
    #	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
    #	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
    #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
    #	VectoCore/VectoCore/Properties/Version.cs
    #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
    #	VectoCore/VectoCore/VersionNumber.t4
    #	VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
    #	VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
    #	VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
    #	VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
    72fb9634
    History
    Merge branch 'develop' of...
    Markus Quaritsch authored
    Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-1073-support-for-dual-fuel-engines
    
    # Conflicts:
    #	HashingTool/Properties/Version.cs
    #	VectoCommon/VectoCommon/Properties/Version.cs
    #	VectoCommon/VectoHashing/Properties/Version.cs
    #	VectoConsole/Properties/Version.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
    #	VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
    #	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
    #	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
    #	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
    #	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
    #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
    #	VectoCore/VectoCore/Properties/Version.cs
    #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
    #	VectoCore/VectoCore/VersionNumber.t4
    #	VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
    #	VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
    #	VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
    #	VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
Code owners
Assign users and groups as approvers for specific file changes. Learn more.