Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-06-20 12:59:43 +01:00
14 changed files with 220 additions and 146 deletions

View File

@ -209,7 +209,6 @@ server_loop(void)
server_window_loop();
server_client_loop();
key_bindings_clean();
server_clean_dead();
}
}