commit | 73b9328c1fcf659dd884b8574cf7fabf0557ccae | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Jun 01 18:29:36 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Jun 01 18:29:36 2017 +0100 |
tree | 1a06eb8b88f124cdc226bb9b8d11eb16a84d0d91 | |
parent | 92d86586b713ae89f3be40efbbd31089ec378e6b [diff] | |
parent | 248aa54bfdef25ff95db3c3426651f9894c652c5 [diff] |
Merge branch 'obsd-master' Conflicts: window-buffer.c