# HG changeset patch
# User Ritor1
# Date 1363010582 -21600
# Node ID 48ab06ab9766eb6fabb334a2c3734e4495a3e34d
# Parent  afc4cbf38aac652a1cea0aba0387daeb11bc48ba# Parent  96d8aa4d8c9514f6a1eaec4a1ae2325a46072b34
Слияние

diff -r 96d8aa4d8c95 -r 48ab06ab9766 mm7_2.cpp