]> git.ipfire.org Git - thirdparty/openssl.git/commit
projects / thirdparty / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9eee58c) | patch
Fixup conflict between 3rd party quic-tls api and quic-server
authorNeil Horman <nhorman@openssl.org>
Fri, 14 Feb 2025 20:58:58 +0000 (15:58 -0500)
committerNeil Horman <nhorman@openssl.org>
Mon, 17 Feb 2025 16:27:34 +0000 (11:27 -0500)
commit473e6bcb2ccda5aa5c4386b10a3beb18f492ef7d
tree9f4d455a1413ee782025a08c05c745999472a8c5tree
parent9eee58cce487d223b6c4338d8508e2f39b82421ccommit | diff
Fixup conflict between 3rd party quic-tls api and quic-server

Build.info changes between quic-server and master occured here, resolve
them.  Can't do it as a fixup as the conficting changes have already
been merged to master

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26762)
ssl/quic/build.info diff | blob | blame | history
Mirror of https://github.com/openssl/openssl.git