Merge branch 'refs/heads/t/com_locate' into pu pu
authorAndre Noll <maan@tuebingen.mpg.de>
Wed, 19 Jun 2019 09:38:55 +0000 (11:38 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Wed, 19 Jun 2019 09:38:55 +0000 (11:38 +0200)
1  2 
tfortune.c
tfortune.suite.m4

diff --cc tfortune.c
Simple merge
Simple merge