Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-12-10 16:01:25 +00:00
2 changed files with 52 additions and 13 deletions

4
tmux.h
View File

@ -62,9 +62,9 @@ struct winlink;
/* Client-server protocol version. */
#define PROTOCOL_VERSION 8
/* Default global configuration file. */
/* Default configuration files. */
#ifndef TMUX_CONF
#define TMUX_CONF "/etc/tmux.conf"
#define TMUX_CONF "/etc/tmux.conf:~/.tmux.conf"
#endif
/* Minimum layout cell size, NOT including border lines. */