diff options
author | Thomas Adam <thomas@xteddy.org> | 2019-12-10 16:01:25 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2019-12-10 16:01:25 +0000 |
commit | 5b2048fbb9fac8a894be52551f28b056cc7d3b66 (patch) | |
tree | 378e770de19c4aabbb4a0780ec8ff35a3620dd4d /tmux.h | |
parent | 92ecd611f68663dfceb2494e637b3ebe51d3fd86 (diff) | |
parent | 55eb3e4773b8e73d7073c53aa5a61a017631b519 (diff) | |
download | rtmux-5b2048fbb9fac8a894be52551f28b056cc7d3b66.tar.gz rtmux-5b2048fbb9fac8a894be52551f28b056cc7d3b66.tar.bz2 rtmux-5b2048fbb9fac8a894be52551f28b056cc7d3b66.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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. */ |