commit | 953c3ef47a1933d38308075c1bacc7ea8d38301b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Apr 23 11:26:11 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Apr 23 11:26:11 2014 +0100 |
tree | 6484bdd51ecedbb5888717db271c151257ec87f5 | |
parent | 12e9c974fadc5ed6f0e7db10c40d5a0d55e0da8a [diff] | |
parent | 64613b9d411a7c76a50a2f9c66df345f082fce25 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile tmux.1 window.c