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)
commit49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d
tree71830c1751e291e45795958cad15e9dfa8239e1a
parentb9333fef25b57bdd7f556f5fb73f9abaef9bc5ef
parente500e9ec3678dfbb666d173854c134ac3858f8b1
Merge branch 'master' into rewrite_of_cadet_test
src/cadet/Makefile.am