Merge branch 'obsd-master'

Conflicts:
	cmd-find.c
This commit is contained in:
Thomas Adam
2015-10-25 09:21:37 +00:00
12 changed files with 78 additions and 19 deletions

1
tmux.1
View File

@ -3411,6 +3411,7 @@ The following variables are available, where appropriate:
.It Li "pid" Ta "" Ta "Server PID"
.It Li "scroll_region_lower" Ta "" Ta "Bottom of scroll region in pane"
.It Li "scroll_region_upper" Ta "" Ta "Top of scroll region in pane"
.It Li "scroll_position" Ta "" Ta "Scroll position in copy mode"
.It Li "session_alerts" Ta "" Ta "List of window indexes with alerts"
.It Li "session_attached" Ta "" Ta "Number of clients session is attached to"
.It Li "session_activity" Ta "" Ta "Integer time of session last activity"