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

Skip to content
  • Markus QUARITSCH's avatar
    38fd6df2
    Merge branch 'develop' into feature/VECTO-1572-mockup-vecto-vif · 38fd6df2
    Markus QUARITSCH authored
    # Conflicts:
    #	Tools/VECTOConsoleStart/Program.cs
    #	VECTO/VECTO.vbproj
    #	VECTO3GUI2020/Util/XML/XMLNamespaces.cs
    #	VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
    #	VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
    #	VectoCommon/VectoCommon/Models/PowertrainPosition.cs
    #	VectoConsole/Program.cs
    #	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs
    #	VectoCore/VectoCoreTest/VectoCoreTest.csproj
    38fd6df2
    Merge branch 'develop' into feature/VECTO-1572-mockup-vecto-vif
    Markus QUARITSCH authored
    # Conflicts:
    #	Tools/VECTOConsoleStart/Program.cs
    #	VECTO/VECTO.vbproj
    #	VECTO3GUI2020/Util/XML/XMLNamespaces.cs
    #	VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
    #	VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
    #	VectoCommon/VectoCommon/Models/PowertrainPosition.cs
    #	VectoConsole/Program.cs
    #	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs
    #	VectoCore/VectoCoreTest/VectoCoreTest.csproj
Loading