]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Merge branch 'OpenPrinting:master' into master 580/head
authorMario Goppold <ml@goppold.net>
Fri, 20 Jan 2023 14:31:45 +0000 (15:31 +0100)
committerGitHub <noreply@github.com>
Fri, 20 Jan 2023 14:31:45 +0000 (15:31 +0100)
1  2 
scheduler/job.c

diff --cc scheduler/job.c
Simple merge