diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-31 23:56:35 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-31 23:56:35 +0000 |
| commit | c975de2e07bdb21c85fc4f2c14a17bc00ca63aff (patch) | |
| tree | 70ff97109da24dc7273b59df6ef6a9f298e16c48 /proc.c | |
| parent | 17f6c3be8eeb0b67d07f916026dab918795c0317 (diff) | |
| parent | ba7fb49fb9b972a03547381783abe91be3fcfa37 (diff) | |
| download | rtmux-c975de2e07bdb21c85fc4f2c14a17bc00ca63aff.tar.gz rtmux-c975de2e07bdb21c85fc4f2c14a17bc00ca63aff.tar.bz2 rtmux-c975de2e07bdb21c85fc4f2c14a17bc00ca63aff.zip | |
Merge branch 'obsd-master'
Conflicts:
server.c
Diffstat (limited to 'proc.c')
| -rw-r--r-- | proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -121,7 +121,6 @@ peer_check_version(struct tmuxpeer *peer, struct imsg *imsg) return (-1); } - imsg->hdr.peerid >>= 8; return (0); } |