Merge branch 'obsd-master'

Conflicts:
	client.c
This commit is contained in:
Thomas Adam
2014-08-09 20:31:36 +01:00
17 changed files with 249 additions and 189 deletions

View File

@ -68,7 +68,7 @@ paste_walk(struct paste_buffer *pb)
return (RB_NEXT(paste_time_tree, &paste_by_time, pb));
}
/* Get the most recent automatic buffer */
/* Get the most recent automatic buffer. */
struct paste_buffer *
paste_get_top(void)
{
@ -80,7 +80,7 @@ paste_get_top(void)
return (pb);
}
/* Free the most recent buffer */
/* Free the most recent buffer. */
int
paste_free_top(void)
{