commit | 1076a2e26c224d17c32a2d1770997d8718903f20 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Jul 12 13:39:59 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Jul 12 13:43:08 2017 +0100 |
tree | 2a51f6e719b9cbff0e37d7a887e56992ffb875bd | |
parent | fbbf5a108b01c742ca11e779845a4d19a1c5edd1 [diff] | |
parent | 51112221eeb31ced907f0dfcf077582996c20c07 [diff] |
Merge branch 'obsd-master' Conflicts: cmd-pipe-pane.c proc.c tmux.c window.c