Merge branch 'obsd-master'

Conflicts: server-client.c tmux.1
2025-09-03 14:27:09 +00:00 · 2017-04-06 11:10:17 +01:00
parent 05c97d7fe9 94b71bcb64
commit 5f662d91db
11 changed files with 78 additions and 57 deletions
--- a/cfg.c
+++ b/cfg.c
@ -27,7 +27,7 @@

 #include "tmux.h"

-char		 *cfg_file;
+static char	 *cfg_file;
 int		  cfg_finished;
 static char	**cfg_causes;
 static u_int	  cfg_ncauses;