aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-01-23 12:20:43 +0000
committerThomas Adam <thomas@xteddy.org>2017-01-23 12:20:43 +0000
commitb3a724f30ced2f3be3a52fb54c6551b2b6c6de63 (patch)
treeeba69fe13464cf92fcf64cf32505e308949718b6 /server.c
parentd2eab39ffa42a0d5d8e796cbe3352f951f42b4f7 (diff)
parent98e7fbb2acee0238381feea5d583fc439aae08e2 (diff)
downloadrtmux-b3a724f30ced2f3be3a52fb54c6551b2b6c6de63.tar.gz
rtmux-b3a724f30ced2f3be3a52fb54c6551b2b6c6de63.tar.bz2
rtmux-b3a724f30ced2f3be3a52fb54c6551b2b6c6de63.zip
Merge branch 'obsd-master'
Conflicts: Makefile tmux.c
Diffstat (limited to 'server.c')
0 files changed, 0 insertions, 0 deletions