# HG changeset patch
# User Ritor1
# Date 1366601122 -21600
# Node ID becbb0b11b7d6fc4a9e3ebeacf7767ab93ab1485
# Parent  e2c1cb9b46f642efc7f638e461e6bd33ffe58d7b# Parent  f3ccfc765502d17dc1f0b078d4e6176e78436c40
Слияние

diff -r f3ccfc765502 -r becbb0b11b7d mm7_4.cpp