Merge branch 'obsd-master'

Conflicts:
	server-client.c
	tmux.1

1 files changed, 1 insertions, 1 deletions

diff --git a/cfg.c b/cfg.c
index b1fe22bf..5fcd6de5 100644
--- 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;