Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-06-28 14:01:13 +01:00
4 changed files with 6 additions and 4 deletions

4
tmux.h
View File

@ -98,8 +98,8 @@ struct tmuxproc;
/* Key modifier bits. */
#define KEYC_ESCAPE 0x200000000000ULL
#define KEYC_CTRL 0x400000000000ULL
#define KEYC_SHIFT 0x800000000000ULL
#define KEYC_CTRL 0x400000000000ULL
#define KEYC_SHIFT 0x800000000000ULL
#define KEYC_XTERM 0x1000000000000ULL
/* Mask to obtain key w/o modifiers. */