:: commit 981c06825bbe6f52e340c93efe22547efbc80c68

mintsuki <mintsuki@protonmail.com> — 2022-01-22 03:31

parents: d00ec6fa3d 9ce5f54e31

Merge branch 'trunk' into v2.0-branch

# Conflicts:
#	GNUmakefile.in
#	stage23/console.c
#	stage23/fs/file.s2.c

no textual diff.

tab: 248 wrap: offon