Merge branch 'obsd-master'

Conflicts: tmux.h
2025-09-04 23:56:58 +00:00 · 2013-05-25 11:48:12 +01:00
parent 907ad00300 88a4da9747
commit 76cb088d16
6 changed files with 15 additions and 6 deletions
--- a/tmux.h
+++ b/tmux.h
@ -39,6 +39,9 @@
 extern char    *__progname;
 extern char   **environ;

+/* Default global configuration file. */
+#define TMUX_CONF "/etc/tmux.conf"
+
 /* Default prompt history length. */
 #define PROMPT_HISTORY 100