Mercurial > public > ostc4

comparison ostc4pack/OSTC4_Firmware.bin @ 352:1f24022345d1 fix-merge-mess

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge problem The merge in changeset 352 is simply wrong, so revert all changes made in that merge. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Tue, 08 Oct 2019 16:35:45 +0200
parents ba53ab77f059
children
comparison
equal deleted inserted replaced
351:ba53ab77f059 352:1f24022345d1
1 (binary file application/octet-stream, hash: 44c77bbe4883aed39b7ec4b72133b42b3e931495) 1 (binary file application/octet-stream, hash: 02df5cc356e73b772f0ac3b1de811b7ee2b2e04a)