# HG changeset patch
# User Ritor1
# Date 1351795458 -21600
# Node ID 2d3f4e0379ced1cda38cda3a493930942cdc655c
# Parent  8c6308bb19b39b296c84dd1e4587bfb01e8eef14# Parent  c0cf9393af64dfac4ffc43b780d562256f97cf26
Слияние

diff -r 8c6308bb19b3 -r 2d3f4e0379ce mm7_4.cpp