Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-12-28 12:01:14 +00:00
2 changed files with 3 additions and 2 deletions

2
tmux.h
View File

@ -1307,7 +1307,7 @@ enum cmd_entry_flag {
CMD_SESSION,
CMD_SESSION_CANFAIL,
CMD_SESSION_PREFERUNATTACHED,
CMD_SESSION_WITHPANE,
CMD_SESSION_WITHPANE, /* implies PREFERUNATTACHED */
CMD_WINDOW,
CMD_WINDOW_CANFAIL,