Fixup changelog

This commit is contained in:
Gianfranco Costamagna 2021-01-06 14:25:04 +01:00
parent bded0f07db
commit 1bdf6f2a40
2 changed files with 2 additions and 4 deletions

4
debian/changelog vendored
View File

@ -11,12 +11,8 @@ llvm-toolchain-11 (1:11.0.1-1) unstable; urgency=medium
llvm-toolchain-11 (1:11.0.1~+rc2-1) unstable; urgency=medium llvm-toolchain-11 (1:11.0.1~+rc2-1) unstable; urgency=medium
<<<<<<<
* New snapshot release
=======
* New snapshot release * New snapshot release
* Remove 'gnu-assembler-compat.diff' - merged upstream * Remove 'gnu-assembler-compat.diff' - merged upstream
>>>>>>>
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 19 Dec 2020 09:38:48 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Sat, 19 Dec 2020 09:38:48 +0100

View File

@ -132,6 +132,7 @@ workaround-bug-42994-use-linker.diff
# bug 939472 # bug 939472
#try-to-unbreak-thinlto.diff #try-to-unbreak-thinlto.diff
D67877.patch
x86-fuzzer.patch x86-fuzzer.patch
@ -140,3 +141,4 @@ print-lldb-path.patch
libcxx-armhf-ftbfs.diff libcxx-armhf-ftbfs.diff
silent-integration-test-suite-i386.diff silent-integration-test-suite-i386.diff
D94072.diff