dgit.raspbian.org Git - thunderbird.git/commit

projects / thunderbird.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 537f5f1 5b56037)

author	Peter Michael Green <plugwash@raspbian.org>
	Thu, 25 Jul 2024 20:07:22 +0000 (20:07 +0000)
committer	Peter Michael Green <plugwash@raspbian.org>
	Thu, 25 Jul 2024 20:07:22 +0000 (20:07 +0000)
commit	d859387253df8d7651fa67bae6363b9013e37a28
tree	e37c9b8c55e54b53a687ca6d0ee97f825d416b61	tree \| snapshot
parent	537f5f11c0befd0331cfdb16f705b7e6356823b9	commit \| diff
parent	5b56037e4a73500da861feb0658d5891bee475ff	commit \| diff

Manual merge of version 1:102.13.0-1~deb12u1+rpi1 and 1:115.12.0-1 to produce 1:115.12.0-1+rpi1

16 files changed:

build/moz.configure/arm.configure	diff1 \|	diff2 \|	blob \| history
build/moz.configure/rust.configure	diff1 \|	diff2 \|	blob \| history
config/makefiles/rust.mk	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/patches/series	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
gfx/qcms/src/lib.rs	diff1 \|	diff2 \|	blob \| history
gfx/qcms/src/transform.rs	diff1 \|	diff2 \|	blob \| history
media/libvpx/sources.mozbuild	diff1 \|	diff2 \|	blob \| history
modules/fdlibm/src/math_private.h	diff1 \|	diff2 \|	blob \| history
security/nss/lib/freebl/Makefile	diff1 \|	diff2 \|	blob \| history
security/nss/lib/freebl/freebl.gyp	diff1 \|	diff2 \|	blob \| history
security/nss/lib/freebl/gcm.c	diff1 \|	diff2 \|	blob \| history
third_party/rust/nss_build_common/.cargo-checksum.json	diff1 \|	diff2 \|	blob \| history
third_party/rust/nss_build_common/src/lib.rs	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.