Commit graph

153 commits

Author SHA1 Message Date
SpiritCroc
a82ee6bc74 Automatic upstream merge postprocessing
Change-Id: I6f2814261df91b8b4e2aeb0698cc39ea54a2899a
2020-09-08 19:17:22 +02:00
SpiritCroc
700ff022d5 [TMP] Automatic upstream merge preparation
Change-Id: I55e22241e686b30ee1f1674095004ea6fdb6d280
2020-09-08 18:29:29 +02:00
SpiritCroc
cd7fb3e164 Add pre_merge.sh merge helper
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
2020-09-08 18:29:26 +02:00