Merge branch 'obsd-master'

Conflicts:
	tmux.h
This commit is contained in:
Thomas Adam
2013-05-25 11:48:12 +01:00
6 changed files with 15 additions and 6 deletions

2
tmux.1
View File

@ -3540,7 +3540,7 @@ Lock each client individually by running the command specified by the
.Ic lock-command
option.
.It Xo Ic run-shell
.Fl b
.Op Fl b
.Op Fl t Ar target-pane
.Ar shell-command
.Xc