commit | b3a724f30ced2f3be3a52fb54c6551b2b6c6de63 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jan 23 12:20:43 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jan 23 12:20:43 2017 +0000 |
tree | eba69fe13464cf92fcf64cf32505e308949718b6 | |
parent | d2eab39ffa42a0d5d8e796cbe3352f951f42b4f7 [diff] | |
parent | 98e7fbb2acee0238381feea5d583fc439aae08e2 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile tmux.c