# HG changeset patch
# User Ritor1
# Date 1385377779 -21600
# Node ID 5bed2eba16118c9386819b979950541de7b9db84
# Parent  ea8e801fdeab991b3872629eadc8fefc910bbe2b# Parent  98a727563cc3ed05f27cdd6c47d332f55b040dea
Слияние

diff -r ea8e801fdeab -r 5bed2eba1611 mm7_2.cpp