dgit.raspbian.org Git - firefox-esr.git/commit

projects / firefox-esr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d28a713 3a3257b)

author	Peter Michael Green <plugwash@raspbian.org>
	Thu, 19 Jun 2025 10:16:45 +0000 (10:16 +0000)
committer	Peter Michael Green <plugwash@raspbian.org>
	Thu, 19 Jun 2025 10:16:45 +0000 (10:16 +0000)
commit	b22b699b0fb5ebeee72730acdf9d228eb5c104d2
tree	168345958b95d50d40aee461a3b005826b8efb58	tree \| snapshot
parent	d28a713ad1ce9e49616f0c4305636df4f7b2a190	commit \| diff
parent	3a3257bb4f2c6e31f8123246e57bbcb00c9184a7	commit \| diff

Manual merge of version 115.15.0esr-1+rpi1 and 128.11.0esr-1 to produce 128.11.0esr-1+rpi1

13 files changed:

build/moz.configure/rust.configure	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/patches/series	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
gfx/qcms/src/transform.rs	diff1 \|	diff2 \|	blob \| history
gfx/ycbcr/moz.build	diff1 \|	diff2 \|	blob \| history
js/moz.configure	diff1 \|	diff2 \|	blob \| history
media/libaom/moz.build	diff1 \|	diff2 \|	blob \| history
media/libaom/sources.mozbuild	diff1 \|	diff2 \|	blob \| history
media/libvpx/sources.mozbuild	diff1 \|	diff2 \|	blob \| history
modules/fdlibm/src/math_private.h	diff1 \|	diff2 \|	blob \| history
mozglue/build/arm.h	diff1 \|	diff2 \|	blob \| history
third_party/aom/aom_dsp/aom_dsp.cmake	diff1 \|	diff2 \|	blob \| history

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