tree 7a206b11feb73a7cc5c6e468fbf1f9dba8cfee4f
parent 2993b2feadd08a993b20ffda91eb4c55f72720a0
parent b8441e1e355164527ba6aeb857248190f60524ea
author Matthias Sohn <matthias.sohn@sap.com> 1606322365 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1606322406 +0100

Merge branch 'master' into stable-5.10

* master:
  Update Orbit to S20201118210000 and add target for 4.18
  PacketLineIn: ensure that END != DELIM
  PacketLineIn: ensure that END != DELIM
  Allow to resolve a conflict by checking out a file
  Update Orbit to I20201111205634
  Document that setLastModified sets time of symlink target
  Fix bug in PerformanceLogContext
  Fix IOException occurring during gc

Change-Id: I2980552381d1ae61b9b2d81d7289de37d6bf4cae
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>