Merge branch 'obsd-master'

Conflicts: paste.c
2025-09-02 05:21:10 +00:00 · 2016-10-13 08:09:47 +01:00
parent 76a9e6f27b e0add119ea
commit 6551f4bb3b
16 changed files with 414 additions and 490 deletions
--- a/paste.c
+++ b/paste.c
@ -17,7 +17,6 @@
 */

 #include <sys/types.h>
-#include <sys/time.h>

 #include <stdlib.h>
 #include <string.h>