commit | 7acc4addb51c711afed3761302c2d3457125445c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Jun 07 23:42:25 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Jun 07 23:42:25 2015 +0100 |
tree | 03cca6f3242974dba6adc2c1d1b721a595d24a37 | |
parent | a5c55e439383202547e442f6afc0c8c664687728 [diff] | |
parent | c4e811e51936edab66803a7b9e099ac135e6e19b [diff] |
Merge branch 'obsd-master' Conflicts: client.c tmux.1 tmux.c