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

projects / filament.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c8b8c78 1fda70f)

author	Peter Michael Green <plugwash@raspbian.org>
	Sat, 30 Sep 2023 14:21:26 +0000 (14:21 +0000)
committer	Peter Michael Green <plugwash@raspbian.org>
	Sat, 30 Sep 2023 14:21:26 +0000 (14:21 +0000)
commit	4642f2afe8fe9adb140d2d29c4f5097b1dc46765
tree	8e296c39e70620ced0be5b039e97ccc2e89963ae	tree \| snapshot
parent	c8b8c782b20eaeeedaa4d33971f8085edc3370ce	commit \| diff
parent	1fda70f9ba94ee1b896d0b259acb09cca93177bc	commit \| diff

Manual merge of version 1.9.25+dfsg2-10+rpi1 and 1.9.25+dfsg2-12 to produce 1.9.25+dfsg2-12+rpi1

debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
third_party/civetweb/build.cmd	diff1 \|	diff2 \|	blob \| history
third_party/civetweb/mingw.cmd	diff1 \|	diff2 \|	blob \| history

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