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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server.c
This commit is contained in:
Thomas Adam
2015-10-31 23:56:35 +00:00
parent 17f6c3be8e ba7fb49fb9
commit c975de2e07
10 changed files with 25 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tmux.h
View File

@ -1105,8 +1105,6 @@ struct tty {
int fd;
struct bufferevent *event;
int log_fd;
struct termios tio;
struct grid_cell cell;
@ -1558,6 +1556,7 @@ void environ_update(const char *, struct environ *, struct environ *);
void environ_push(struct environ *);
/* tty.c */
void tty_create_log(void);
void tty_init_termios(int, struct termios *, struct bufferevent *);
void tty_raw(struct tty *, const char *);
void tty_attributes(struct tty *, const struct grid_cell *,