Merge branch 'obsd-master'

Sync from OpenBSD.
This commit is contained in:
Thomas Adam 2012-11-08 21:27:40 +00:00
commit be10e8eee6

3
tmux.h
View File

@ -96,7 +96,8 @@ extern char **environ;
#define CHOOSE_CLIENT_TEMPLATE \ #define CHOOSE_CLIENT_TEMPLATE \
"#{client_tty}: #{session_name} " \ "#{client_tty}: #{session_name} " \
"[#{client_width}x#{client_height} #{client_termname}]" \ "[#{client_width}x#{client_height} #{client_termname}]" \
"#{?client_utf8, (utf8),} #{?client_readonly, (ro),}" "#{?client_utf8, (utf8),}#{?client_readonly, (ro),} " \
"(last used #{client_activity_string})"
/* Default templates for choose-tree. */ /* Default templates for choose-tree. */
#define CHOOSE_TREE_SESSION_TEMPLATE \ #define CHOOSE_TREE_SESSION_TEMPLATE \