Merge branch 'obsd-master'

Conflicts:
	server-client.c
	tmux.1

1 files changed, 1 insertions, 1 deletions

diff --git a/tmux.h b/tmux.h
index 1cd9e9dc..12847f1e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1025,7 +1025,6 @@ LIST_HEAD(tty_terms, tty_term);
 
 struct tty {
 	struct client	*client;
-	char		*path;
 
 	u_int		 sx;
 	u_int		 sy;
@@ -1289,6 +1288,7 @@ struct cmd_entry {
 
 /* Client connection. */
 struct client {
+	const char	*name;
 	struct tmuxpeer	*peer;
 	struct cmdq_list queue;