commit | 8213558cc77e6298e7f246ce3f45b5cd8af05a7b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Nov 15 22:49:25 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Nov 15 22:49:25 2015 +0000 |
tree | fddd40672e3a94d18c8955fa999213aad2054951 | |
parent | bb820fa761747a2c5342f61c4fbe5368565ef9b3 [diff] | |
parent | a582b622879714b0a100e8c7d3054f5a03476ca1 [diff] |
Merge branch 'obsd-master' Conflicts: server.c tmux.c