# HG changeset patch
# User Ritor1
# Date 1351394428 -21600
# Node ID 2fd44e5cbe8989fd4f90f571530c742d72fcf42d
# Parent  e49e6d3042f219d4f054db76e77e5a9412b2bd0c# Parent  75994455e457c82e5b3635b5978389933e9db4da
Слияние

diff -r 75994455e457 -r 2fd44e5cbe89 mm7_4.cpp