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

Skip to content
Snippets Groups Projects
  1. Jan 14, 2022
    • Markus QUARITSCH's avatar
      Merge branch 'feature/VECTO-1410-jrc-fix_2' into feature/VECTO-1410_IVT-multistage-tool-buses · ca93c092
      Markus QUARITSCH authored
      # Conflicts:
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
      #	VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
      #	VectoCommon/VectoCommon/Hashing/VectoComponents.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.resx
      #	VectoCommon/VectoHashing/VectoHash.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
      #	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
      #	VectoCore/VectoCore/Utils/XMLHelper.cs
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
      ca93c092
  2. Nov 29, 2021
  3. Nov 11, 2021
  4. Nov 08, 2021
  5. Nov 03, 2021
  6. Oct 22, 2021
  7. Oct 12, 2021
  8. Oct 11, 2021
  9. Oct 05, 2021
  10. Oct 04, 2021
  11. Sep 21, 2021
  12. Sep 20, 2021
  13. Sep 17, 2021
Loading