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

projects / wine.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bd313e4 45ffffe)

author	Peter Michael Green <plugwash@raspbian.org>
	Fri, 22 Jul 2022 02:19:42 +0000 (02:19 +0000)
committer	Peter Michael Green <plugwash@raspbian.org>
	Fri, 22 Jul 2022 04:54:22 +0000 (04:54 +0000)
commit	197510369222e937f73ec4640c7a39f096935cba
tree	d83b14984611a645ee9821fb40d9a4a4aa5fb9fd	tree \| snapshot
parent	bd313e4a63d127ef28688617e256a91e3cd9a467	commit \| diff
parent	45ffffe1aebd5df0f0f578b1966ce89680788471	commit \| diff

Manual merge of version 6.0.3~repack-1+rpi1 and 7.0~repack-4 to produce 7.0~repack-4+rpi1

debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/patches/raspbian.patch	diff1 \|	\|	blob \| history
debian/patches/series	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/unix/signal_arm.c	diff1 \|	diff2 \|	blob \| history

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