Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.1
	window.c
This commit is contained in:
Thomas Adam
2014-04-23 11:26:11 +01:00
49 changed files with 431 additions and 489 deletions

View File

@ -217,7 +217,7 @@ server_loop(void)
}
}
/* Check if the server should be shutting down (no more clients or sessions). */
/* Check if the server should exit (no more clients or sessions). */
int
server_should_shutdown(void)
{