Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c
This commit is contained in:
Thomas Adam
2015-08-30 21:44:01 +01:00
26 changed files with 594 additions and 388 deletions

View File

@ -251,9 +251,10 @@ void
server_loop(void)
{
while (!server_should_shutdown()) {
log_debug("event dispatch enter");
event_loop(EVLOOP_ONCE);
log_debug("event dispatch exit");
server_window_loop();
server_client_loop();
}
}