diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-04-21 09:25:07 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-04-21 09:25:07 +0100 |
| commit | 22e594fcea0c3e73660780665296e2d5d71bd745 (patch) | |
| tree | 6da2d795aaa489c045da9075e7ba2f1d17383f71 /server.c | |
| parent | 02580ac134522437bcfe8a68138787d444171d19 (diff) | |
| parent | 87997efe8d4d6aeca561107f5449818184687240 (diff) | |
| download | rtmux-22e594fcea0c3e73660780665296e2d5d71bd745.tar.gz rtmux-22e594fcea0c3e73660780665296e2d5d71bd745.tar.bz2 rtmux-22e594fcea0c3e73660780665296e2d5d71bd745.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile.am
pty.c
Diffstat (limited to 'server.c')
0 files changed, 0 insertions, 0 deletions