Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-10-18 22:01:08 +01:00
3 changed files with 15 additions and 13 deletions

3
tmux.h
View File

@ -396,11 +396,12 @@ enum msgtype {
MSG_IDENTIFY_FLAGS = 100,
MSG_IDENTIFY_TERM,
MSG_IDENTIFY_TTYNAME,
MSG_IDENTIFY_CWD,
MSG_IDENTIFY_OLDCWD, /* unused */
MSG_IDENTIFY_STDIN,
MSG_IDENTIFY_ENVIRON,
MSG_IDENTIFY_DONE,
MSG_IDENTIFY_CLIENTPID,
MSG_IDENTIFY_CWD,
MSG_COMMAND = 200,
MSG_DETACH,