commit | 0c99c7dbff21082a5f0774e6193b9c9b9a160882 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Apr 05 12:36:14 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Apr 05 12:36:14 2014 +0100 |
tree | 852fa9fde3126091fa90ee6604097373076772b1 | |
parent | 806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f [diff] | |
parent | acef311fe356f408690e9f94727ed63a934b742f [diff] |
Merge branch 'obsd-master' Conflicts: Makefile tty-keys.c