Peter Korsgaard c287d789b7 Merge branch 'next' ...

A number of merge conflicts, but hopefully they are all sorted out now.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

2020-09-02 18:14:46 +02:00

..

capnproto.hash

…

capnproto.mk

Merge branch 'next'

2020-09-02 18:14:46 +02:00

Config.in

…