Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-01-19 18:01:15 +00:00
108 changed files with 215 additions and 162 deletions

4
tmux.1
View File

@ -1,6 +1,6 @@
.\" $OpenBSD$
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@ -4253,4 +4253,4 @@ bind-key S command-prompt "new-window -n %1 'ssh %1'"
.Sh SEE ALSO
.Xr pty 4
.Sh AUTHORS
.An Nicholas Marriott Aq Mt nicm@users.sourceforge.net
.An Nicholas Marriott Aq Mt nicholas.marriott@gmail.com