# HG changeset patch
# User Ritor1
# Date 1364785551 -21600
# Node ID 715064ae1792f8ba1640f89c93d4174b3fb608d6
# Parent  6759478c2f145d73d6e79c59bd1ff79a67f862e2# Parent  54f191fc5e1e7bcf03ceb71d06da1888fa73ba45
Слияние

diff -r 54f191fc5e1e -r 715064ae1792 mm7_3.cpp