Merge master into image_merge

This commit is contained in:
Nicholas Marriott
2026-10-14 14:08:01 +01:00
4 changed files with 4 additions and 4 deletions

2
tty.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tty.c,v 1.486 2026/10/12 10:39:05 nicm Exp $ */
/* $OpenBSD: tty.c,v 1.487 2026/10/14 08:33:19 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>