Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-06-07 18:01:13 +01:00
4 changed files with 5 additions and 5 deletions

2
proc.c
View File

@ -45,7 +45,7 @@ struct tmuxpeer {
#define PEER_BAD 0x1
void (*dispatchcb)(struct imsg *, void *);
void *arg;
void *arg;
};
static int peer_check_version(struct tmuxpeer *, struct imsg *);