# HG changeset patch
# User heinrichs weikamp
# Date 1646379023 -3600
# Node ID ef2ed7e3a89574c1ad2c9d4a84b8f7b6a573c6c0
# Parent  aeca5717d9eb4b792fa0c6f2e60c1faecb7b15c5# Parent  070528a887156f9a8cf8cc6854ff52467f2a35ee
Merge

diff -r aeca5717d9eb -r ef2ed7e3a895 src/adc_lightsensor.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/compass_ops.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/configuration.inc
diff -r aeca5717d9eb -r ef2ed7e3a895 src/divemode.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/hwos.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/hwos.inc
diff -r aeca5717d9eb -r ef2ed7e3a895 src/i2c.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/isr.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/menu_tree.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/ms5541.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/option_table.asm
diff -r aeca5717d9eb -r ef2ed7e3a895 src/text_italian.inc
diff -r aeca5717d9eb -r ef2ed7e3a895 src/tft_outputs.asm