# HG changeset patch # User heinrichsweikamp # Date 1318486858 -7200 # Node ID a863fd56189c9bc5d4d36ffd1f5b7773d3d2c26d # Parent 9fc8feff27a50a2df688dd59608e7ac05fdf3552# Parent 8f48826393267ba226ec3ee9918ff4f0443f3628 Merge with 478 diff -r 9fc8feff27a5 -r a863fd56189c code_part1/OSTC_code_asm_part1/definitions.asm --- a/code_part1/OSTC_code_asm_part1/definitions.asm Thu Oct 13 01:59:59 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Thu Oct 13 08:20:58 2011 +0200 @@ -111,6 +111,7 @@ ;============================================================================= #include "../OSTC_code_c_part2/shared_definitions.h" +#include "ostc2_code/code_part1/OSTC_code_c_part2/shared_definitions.h" ;============================================================================= ; Reserve space for C-code data space. Eg.when calling log.