# HG changeset patch
# User Ritor1
# Date 1351481288 -21600
# Node ID c0cf9393af64dfac4ffc43b780d562256f97cf26
# Parent  c83d06692295305891b073a8f12c543ef67eae52# Parent  b39bdc150e90ca64325a134d9a3a798f2dc040b6
Слияние

diff -r b39bdc150e90 -r c0cf9393af64 mm7_4.cpp