commit | d63de1e407176bab41c61ad7f3def0e4d0707cdc | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Nov 23 21:20:54 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Nov 23 21:20:54 2015 +0000 |
tree | 6dd19751b0d0f013bff02af7436b0a7284fd8555 | |
parent | 78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4 [diff] | |
parent | 28e72ae34d43dda28ca0e6dc652eaa1179c351c7 [diff] |
Merge branch 'obsd-master' Conflicts: server.c tmux.c