Merge branch 'develop' into feature/VECTO-1454-xml-schema-for-new-components (b6a3b72b) · Commits · Stefanos DOUMPOULAKIS / Vecto

Commit b6a3b72b authored 3 years ago by Franz KOBER josef

Merge branch 'develop' into feature/VECTO-1454-xml-schema-for-new-components

# Conflicts:
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S_IEPC_Std.xml

parents aada907c cdfaaa4f

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1011 additions and 1200 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment