Merge branch 'obsd-master'

Conflicts:
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2014-02-16 23:02:07 +00:00
14 changed files with 90 additions and 67 deletions

View File

@ -61,7 +61,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
struct client *c;
struct session *s;
struct session *s = NULL;
struct winlink *wl = NULL;
struct window *w = NULL;
struct window_pane *wp = NULL;