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

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
Source project has a limited visibility.
  • Markus Quaritsch's avatar
    cc53c518
    Merge branch 'feature/VECTO-1082-include-waste-heat-recovery-systems' into... · cc53c518
    Markus Quaritsch authored
    Merge branch 'feature/VECTO-1082-include-waste-heat-recovery-systems' into merge/VectoFurtherDeveropment
    
    # Conflicts:
    #	HashingTool/Properties/Version.cs
    #	VECTO/GUI/VectoJobForm.vb
    #	VECTO/OutputData/JSONFileWriter.vb
    #	VectoCommon/VectoCommon/Properties/Version.cs
    #	VectoCommon/VectoCommon/Resources/XMLNames.resx
    #	VectoCommon/VectoHashing/Properties/Version.cs
    #	VectoConsole/Properties/Version.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
    #	VectoCore/VectoCore/Properties/Version.cs
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
    #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
    #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
    #	VectoCore/VectoCore/VectoCore.csproj
    #	VectoCore/VectoCore/VersionNumber.t4
    cc53c518
    History
    Merge branch 'feature/VECTO-1082-include-waste-heat-recovery-systems' into...
    Markus Quaritsch authored
    Merge branch 'feature/VECTO-1082-include-waste-heat-recovery-systems' into merge/VectoFurtherDeveropment
    
    # Conflicts:
    #	HashingTool/Properties/Version.cs
    #	VECTO/GUI/VectoJobForm.vb
    #	VECTO/OutputData/JSONFileWriter.vb
    #	VectoCommon/VectoCommon/Properties/Version.cs
    #	VectoCommon/VectoCommon/Resources/XMLNames.resx
    #	VectoCommon/VectoHashing/Properties/Version.cs
    #	VectoConsole/Properties/Version.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
    #	VectoCore/VectoCore/Properties/Version.cs
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
    #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
    #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
    #	VectoCore/VectoCore/VectoCore.csproj
    #	VectoCore/VectoCore/VersionNumber.t4
Code owners
Assign users and groups as approvers for specific file changes. Learn more.