circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 08:07:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server-client.c
	tmux.1
This commit is contained in:
Thomas Adam
2017-04-06 11:10:17 +01:00
parent 05c97d7fe9 94b71bcb64
commit 5f662d91db
11 changed files with 78 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.h
View File

@ -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;