diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
commit | f17ecaa49544509e93716a84b6510990ed90ceca (patch) | |
tree | 6b89857ce59fc9330c136961defdcc0923cbff40 /signal.c | |
parent | 9c4d0d454aa81b9587ed724e0f87395b1791ce2f (diff) | |
parent | d60663ea8664d1c71def883bd64d97af3f791f89 (diff) | |
download | rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.gz rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.bz2 rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.zip |
Merge branch 'obsd-master'
Conflicts:
Makefile.am
cfg.c
server-client.c
Diffstat (limited to 'signal.c')
0 files changed, 0 insertions, 0 deletions