Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-18 23:02:36 +01:00
3 changed files with 4 additions and 7 deletions

4
tmux.h
View File

@@ -1287,9 +1287,6 @@ struct cmd {
char *file;
u_int line;
#define CMD_CONTROL 0x1
int flags;
TAILQ_ENTRY(cmd) qentry;
};
@@ -1318,6 +1315,7 @@ struct cmdq_shared {
int flags;
#define CMDQ_SHARED_REPEAT 0x1
#define CMDQ_SHARED_CONTROL 0x2
struct format_tree *formats;