Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-23 21:20:54 +00:00
6 changed files with 15 additions and 15 deletions

1
tmux.1
View File

@ -2561,6 +2561,7 @@ command appear.
.It Ic display-time Ar time
Set the amount of time for which status line messages and other on-screen
indicators are displayed.
If set to 0, messages and indicators are displayed until a key is pressed.
.Ar time
is in milliseconds.
.It Ic history-limit Ar lines