commit | 22e594fcea0c3e73660780665296e2d5d71bd745 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Apr 21 09:25:07 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Apr 21 09:25:07 2017 +0100 |
tree | 6da2d795aaa489c045da9075e7ba2f1d17383f71 | |
parent | 02580ac134522437bcfe8a68138787d444171d19 [diff] | |
parent | 87997efe8d4d6aeca561107f5449818184687240 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile.am pty.c