commit | 76688d204071b76fd3388e46e944e4b917c09625 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Sep 06 20:47:50 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Sep 06 20:47:50 2015 +0100 |
tree | b6c7920003106991bbb8db46a432e47b16429c94 | |
parent | 2ebef95994953e49ae84862a65f9ee649a72e200 [diff] | |
parent | aceae73b9a401c0b124a3534079e9c0d998f0dbd [diff] |
Merge branch 'obsd-master' Conflicts: cfg.c tmux.c