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

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
9208 commits behind the upstream repository.
  • Markus Quaritsch's avatar
    a769d748
    Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into develop · a769d748
    Markus Quaritsch authored
    Conflicts:
    	VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
    	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
    	VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
    	VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
    	VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
    	VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
    	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
    	VectoCore/VectoCore/Utils/VectoCSVFile.cs
    	VectoCore/VectoCoreTest/FileIO/JsonTest.cs
    a769d748
    History
    Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into develop
    Markus Quaritsch authored
    Conflicts:
    	VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
    	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
    	VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
    	VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
    	VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
    	VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
    	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
    	VectoCore/VectoCore/Utils/VectoCSVFile.cs
    	VectoCore/VectoCoreTest/FileIO/JsonTest.cs
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
VECTO.vbproj 76.91 KiB