commit | e62e17d0461cfb0bfb55ae3c9c7a3815235298fb | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jun 05 11:59:38 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jun 05 11:59:38 2017 +0100 |
tree | 258f2a1e09eb8553842383636a9f6f8a3f75074a | |
parent | 1c83c0ebcd483c668f02f5f7a8cb80f8a0dc162c [diff] | |
parent | 2f04108f3a35271ef60b3028699b6363e1714140 [diff] |
Merge branch 'obsd-master' Conflicts: tmux.1 window.c