Merge branch 'obsd-master'

Conflicts:
	client.c
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2015-06-07 23:42:25 +01:00
20 changed files with 624 additions and 266 deletions

View File

@ -120,9 +120,9 @@ notify_drain(void)
}
if (ne->client != NULL)
ne->client->references--;
server_client_unref(ne->client);
if (ne->session != NULL)
ne->session->references--;
session_unref(ne->session);
if (ne->window != NULL)
window_remove_ref(ne->window);