fix the merge

This commit is contained in:
Sylvestre Ledru 2023-01-15 18:52:52 +01:00
parent 31f147c46d
commit 698f2d92c5

10
debian/changelog vendored
View File

@ -1,6 +1,5 @@
llvm-toolchain-14 (1:14.0.6-11) UNRELEASED; urgency=medium
<<<<<<<
[ Sylvestre Ledru ]
* Update SV to 4.6.2
* Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu:
@ -8,19 +7,10 @@ llvm-toolchain-14 (1:14.0.6-11) UNRELEASED; urgency=medium
either wasi-libc isn't available or too old or we face bug
https://sourceware.org/bugzilla/show_bug.cgi?id=27558
* adjust the lintian override format with the []
[ Gianfranco Costamagna ]
* Fix riscv64 build by adding spirv again (from @paravoid)
=======
[ Sylvestre Ledru ]
* Update SV to 4.6.2
* Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu
* hardcode a bit less sccache usage
[ Gianfranco Costamagna ]
* Fix riscv64 build by adding spirv again (from @paravoid)
>>>>>>>
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 15 Jan 2023 09:40:55 +0100