# HG changeset patch
# User heinrichsweikamp
# Date 1621874511 -7200
# Node ID 1e695355dfc4cb0ed15fce54431ce8475896e7d8
# Parent  7d8a4c60ec1aeacb8540b4250af09bf36cdfcf98# Parent  1212d39c9f6fe385e38f5e31316b5ef72e10f514
Merge

diff -r 7d8a4c60ec1a -r 1e695355dfc4 src/configuration.inc
diff -r 7d8a4c60ec1a -r 1e695355dfc4 src/option_table.asm
diff -r 7d8a4c60ec1a -r 1e695355dfc4 src/p2_deco.c