Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2013-02-07 12:08:55 +00:00
10 changed files with 77 additions and 15 deletions

View File

@ -330,7 +330,7 @@ int
server_client_assume_paste(struct session *s)
{
struct timeval tv;
u_int t;
int t;
if ((t = options_get_number(&s->options, "assume-paste-time")) == 0)
return (0);