# HG changeset patch # User MattD # Date 1250077569 -3600 # Node ID ae6c205a51ad6b9b737e15f91630f86eec575a53 # Parent d5de3a55f5cc4396ef03509009a3a3f21aa82b92# Parent e9a16b60ea6dac1b1834320edf78b89dca5824a7 catchup merge - removed my foundation model changes from merge and will re-apply later (merge conflicts not worth resolving due to model order changing). diff -r e9a16b60ea6d -r ae6c205a51ad foundation/job_props.ant.xml --- a/foundation/job_props.ant.xml Mon Aug 10 18:41:59 2009 +0100 +++ b/foundation/job_props.ant.xml Wed Aug 12 12:46:09 2009 +0100 @@ -11,9 +11,11 @@ - + + + diff -r e9a16b60ea6d -r ae6c205a51ad foundation/sysdefs/system_model.xml