commit | b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Feb 16 23:02:07 2014 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Feb 16 23:02:07 2014 +0000 |
tree | 8704cc16b1ed5380bcd7c678351d85adfd5907c8 | |
parent | 8edbbb98656a76f0a25b5243b526709a67ae3531 [diff] | |
parent | 81db6bab91309e7cb42628048408c10504522a48 [diff] |
Merge branch 'obsd-master' Conflicts: tmux.1 tmux.c