commit | f17ecaa49544509e93716a84b6510990ed90ceca | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed May 31 15:56:13 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed May 31 15:56:13 2017 +0100 |
tree | 6b89857ce59fc9330c136961defdcc0923cbff40 | |
parent | 9c4d0d454aa81b9587ed724e0f87395b1791ce2f [diff] | |
parent | d60663ea8664d1c71def883bd64d97af3f791f89 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile.am cfg.c server-client.c