diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-03-05 17:58:12 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-03-05 17:58:12 +0000 |
| commit | 5fc5c03dad7e99997df64c682b4ea0fc662dee53 (patch) | |
| tree | 2e928eaa1143850bbe191fcb4b4ac8d171892011 /server.c | |
| parent | 81f78f0da7f72b4707f653d70615c7b64c341d44 (diff) | |
| parent | 0d6de44a37755f0e5046c04e19e4506a6d59e750 (diff) | |
| download | rtmux-5fc5c03dad7e99997df64c682b4ea0fc662dee53.tar.gz rtmux-5fc5c03dad7e99997df64c682b4ea0fc662dee53.tar.bz2 rtmux-5fc5c03dad7e99997df64c682b4ea0fc662dee53.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.c
Diffstat (limited to 'server.c')
0 files changed, 0 insertions, 0 deletions