# HG changeset patch
# User wycc
# Date 1238905775 -28800
# Node ID 5b6230df7630e6e647ff7bd7a68725a6cf2be44e
# Parent  83283a45ffbcf74661dab74919b9a98b1e5d00f6# Parent  a3231496c6de612e0959bd3bbed5537f7c19b8dd
mgerge

diff -r 83283a45ffbc -r 5b6230df7630 img/programming_model.dia
Binary file img/programming_model.dia has changed
diff -r 83283a45ffbc -r 5b6230df7630 img/programming_model.png
Binary file img/programming_model.png has changed