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
This commit is contained in:
Thomas Adam
2017-04-25 20:01:11 +01:00
parent 65d6278f88 d520dae6ac
commit 0daeefefdb
4 changed files with 79 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.h
View File

@ -1103,6 +1103,7 @@ struct tty_ctx {
struct window_pane *wp;
const struct grid_cell *cell;
int wrapped;
u_int num;
void *ptr;
@ -1474,7 +1475,6 @@ void proc_kill_peer(struct tmuxpeer *);
/* cfg.c */
extern int cfg_finished;
extern struct client *cfg_client;
void start_cfg(void);
int load_cfg(const char *, struct client *, struct cmdq_item *, int);
void set_cfg_file(const char *);