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

Skip to content
Snippets Groups Projects
Commit 678f024f authored by Franz KOBER josef's avatar Franz KOBER josef
Browse files

Merge branch... 

Merge branch 'origin_mq/feature/VECTO-1590-implement-ihpc-powertrain-architecture' into feature/VECTO-1579-create-json-filewriter-for-iepc

# Conflicts:
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb
parents 71f39230 976e592d
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3239 additions and 2413 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about