commit ac722bbf0f25c064444ba9c57a695fb92e54fc2a Merge: 18a41f5fc bf995b5aa Author: Juergen Daubert <jue@jue.li> Date: Sat Aug 22 16:32:50 2020 +0000 Merge branch '3.5' into 3.6 Conflicts: boost/.footprint boost/.signature khard/.footprint khard/.signature lldb/.signature open-vm-tools/.signature p5-libwww/.signature pipewire/.signature python3-attrs/.footprint python3-attrs/.signature python3-cffi/.footprint python3-cffi/.signature python3-imagesize/.footprint python3-imagesize/.signature python3-sphinxcontrib-websupport/.footprint python3-sphinxcontrib-websupport/.signature virtualenv/.footprint virtualenv/.signature virtualenv/Pkgfile