commit | 5f662d91db658abbcd46d7a678c0250754be35e3 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Apr 06 11:10:17 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Apr 06 11:10:17 2017 +0100 |
tree | bed316d0ce8c4a770b5e42608a36dafc0a9eee2d | |
parent | 05c97d7fe9ede1b9d185ed21242eb8470350affc [diff] | |
parent | 94b71bcb6403d381515319b08a85878b829785d5 [diff] |
Merge branch 'obsd-master' Conflicts: server-client.c tmux.1