diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-25 16:37:30 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-25 16:37:30 +0000 |
| commit | 890d8da2e3588d416ef178e2e74ed3df226a6040 (patch) | |
| tree | 3d024b90830e8afe48f75f0cb741965a5bb76015 /server-client.c | |
| parent | 0a2ef2b932f37d54157d82e526a8097caf9143ba (diff) | |
| parent | ac8678aefe157d7e40c5bcedd12333eaedf0df92 (diff) | |
| download | rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.tar.gz rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.tar.bz2 rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.zip | |
Merge branch 'obsd-master'
Conflicts:
log.c
proc.c
tmux.c
Diffstat (limited to 'server-client.c')
0 files changed, 0 insertions, 0 deletions