Merge branch 'master' into rewrite_of_cadet_test
authorxrs <xrs@mail36.net>
Wed, 17 Jun 2020 20:07:39 +0000 (22:07 +0200)
committerxrs <xrs@mail36.net>
Wed, 17 Jun 2020 20:07:39 +0000 (22:07 +0200)
1  2 
src/cadet/Makefile.am

Simple merge