Merge image_merge into 4902-image-support

2026-10-15 16:04:34 +00:00 · 2026-10-14 14:42:47 +01:00
parent 7b45ee638b c642ad8804
commit 0659362e57
7 changed files with 12 additions and 12 deletions
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.487 2026/10/14 08:33:19 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.489 2026/10/14 12:48:50 nicm Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>