Directory.Build.targets · 0005ee6d9c33edf229bba1c99d279ee5b7d101f7 · Stefanos DOUMPOULAKIS / Vecto

Forked from VECTO / VECTO Sim

Source project has a limited visibility.

2 years ago

Merge branch 'develop' into feature/VECTO-1572-mockup-vecto-vif · 38fd6df2

# 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

History

Merge branch 'develop' into feature/VECTO-1572-mockup-vecto-vif

Markus Quaritsch authored 2 years ago

# 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

Code owners

Assign users and groups as approvers for specific file changes. Learn more.