with a `.mailmap` file,
see https://git-scm.com/docs/gitmailmap.

Unfortunately, gitlab does not honor yet this file
(https://gitlab.com/gitlab-org/gitlab/-/issues/14909),
but with `git shortlog -sne` on the `trailer `branch we get:

```txt
  4349  Markus QUARITSCH <markus.quaritsch@tugraz.at>
  1300  Michael KRISPER <michael.krisper@tugraz.at>
   401  Harald MARTINI <harald.martini@ivt.tugraz.at>
   182  Terry Burns <Terry.Burns@ricardo.com>
   175  Raphael LUZ <luz@ivt.tugraz.at>
   160  Vasilis Kouliaridis <vasilis.k@emisia.com>
   104  Franz KOBER josef <franz.josef.kober@ivt.tugraz.at>
    50  Kostis Anagnostopoulos <ankostis@gmail.com>
    33  Glenn Zarb <glenn@ascentsoftware.eu>
    16  Stefan BRANDT <brandt@ivt.tugraz.at>
    12  Dana Nurse <Dana.Nurse@ricardo-aea.com>
     9  Stefan MEYER <stefan.meyer@student.tugraz.at>
     2  Kumara Raghavendra <kumargel@yahoo.com>
     2  Raphael Kalchgruber <kalchgruber@ivt.tugraz.at>
```

implies workdir with `eol=lf` on Linux, `crlf` on Windows.

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1660-simulation-aborts-for-a-p1-hybrid-with-smart-ps to develop

* commit '70104eda':
  adding testcase for VECTO-1660 (confidential testdata)

Pull request #258: in case of a smart PS: if in overrun but there is not enough exessive power to provide P_on, still provide P_PS_average (instead of P_off)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1660-simulation-aborts-for-a-p1-hybrid-with-smart-ps to develop

* commit '19fffd16':
  in case of a smart PS: if in overrun but there is not enough exessive power to provide P_on, still provide P_PS_average (instead of P_off)

in case of a smart PS: if in overrun but there is not enough exessive power to provide P_on, still provide P_PS_average (instead of P_off)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1658-xml-export-for-dual-fuel-don-t-work-properly to develop

* commit 'fed55cf1':
  deactivate XML export in GUI

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1644 to develop

* commit '776d36a2':
  adding information about driving action in vmod file
  updating generic vehicles: reduce number of entries in em powermaps, update engine files to latest file format
  updating generic vehicles: reduce number of entries in em powermaps
  Correcting PS Technologies typo
  setting electric aux power (high voltage) to 0 for all generic vehicles
  remove MU cycle from generic IHPC job
  bugfix saving iepc job: always write tcu parameters

Harald Martini authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/hm_vecto-dev:feature/VECTO-1572-mockup-vecto to develop

* commit '1283a6a5':
  changed Small + ESS + elec. driven to Small + AMS + elec. driven
  added Vocational HeavyLorry example files and tests
  don't write summary for vocational vehicles
  made summary optional in customer report xsd
  changed OCV to OVC in MRF and CIF XSD Schema
  changed OCV to OVC in Mockup results

updating generic vehicles: reduce number of entries in em powermaps, update engine files to latest file format

(cherry picked from commit 94c20367)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '29c43cfd':
  updating vif in testfiles to new schema version
  updating mockup classes
  set input data in vecto run data instance, correct writing airdrag in vif
  correcting path in resource file
  correct expected value in testcase
  make input parameter to run simulation in multistep-bus simulation optional. default: run simulation
  removing unnecessary import
  disabling testcases for disabled vehicle groups
  disabling vehicle groups 51 and 52 in segment table

make input parameter to run simulation in multistep-bus simulation optional. default: run simulation

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1606-modal-data-results-only-provide-necessary-columns-in-output to develop

* commit '30dacd2e':
  updating testcase with mock drivingcycle
  refactoring matching of driving cycle when registering component in modal data, adding missing fields in testcases
  update user manual: adding column with component info
  fix testcase: set simulation type
  adding dependent columns for writing sum-file, refactoring registering components
  updating expected vmod and vsum files
  updating expected values in testfiles, correcting typos, reordering sum-fields, adding missing sum-fields
  updating expected vsum files
  updating expected vmod files
  bugfix setting battery id in data adapter
  update expected values in HEV/PEV ADAS tests
  bugfix in initializing gear in case of P2 or P2.5 hybrids: initialize engine with correct beforehand to avoid unreasonaable high inertia torque
  refactoring mod and sum data column creation. adapting testcases.
  consider null values when writing sum-data, adapt testcases where necessary
  cleanup powertrain builder - remove no-longer needed code
  adding more writer functions for summary data registering components with sum-data to add component-specific columns adding component-specific columns in sum-data make auxiliary component register aux with mod-data and sum-data
  adding functor for writing sum data entries
  refactoring sum-container to contain only availalbe component data
  refactorings: register components with sum-data as well (same as mod data), move sum-data fields to a separate class
  update generic roadsweeper vehicle: add missing model parameters

Merge branch 'develop' into feature/VECTO-1606-modal-data-results-only-provide-necessary-columns-in-output

# Conflicts:
#	Documentation/User Manual/5-input-and-output-files/VMOD.md
#	VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
#	VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto

Michael KRISPER authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:feature/VECTO-1630-gear-disabling to develop

* commit '89590fac':
  GenericBusEngineData: added disabling gears
  Gear Disabling Features for Engineering and Declaration HeavyLorry, SingleBus
  Vehicle TorqueLimits for Gears: added testdata for engineering mode
  Refactored Gear Disabling Feature

refactoring matching of driving cycle when registering component in modal data, adding missing fields in testcases

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '8d947c80':
  Setting mission profile weights for group 1s to the same weights as group 1.
  Update of Validation
  corrected design issues, labels; gui checks for input values.
  Additional pictures for different vehicle configurations
  Update of Pictures
  Update of Usermanual, spellcheck, removal of obsolete or outdated values and text. Addition of some text for consistency between VECTO application and in the document