diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-06-01 18:29:36 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-06-01 18:29:36 +0100 |
| commit | 73b9328c1fcf659dd884b8574cf7fabf0557ccae (patch) | |
| tree | 1a06eb8b88f124cdc226bb9b8d11eb16a84d0d91 /control.c | |
| parent | 92d86586b713ae89f3be40efbbd31089ec378e6b (diff) | |
| parent | 248aa54bfdef25ff95db3c3426651f9894c652c5 (diff) | |
| download | rtmux-73b9328c1fcf659dd884b8574cf7fabf0557ccae.tar.gz rtmux-73b9328c1fcf659dd884b8574cf7fabf0557ccae.tar.bz2 rtmux-73b9328c1fcf659dd884b8574cf7fabf0557ccae.zip | |
Merge branch 'obsd-master'
Conflicts:
window-buffer.c
Diffstat (limited to 'control.c')
0 files changed, 0 insertions, 0 deletions