# HG changeset patch
# User Ritor1
# Date 1367399631 -21600
# Node ID 851697c5c2f26d1c558134a4cc2ab821d076a5a3
# Parent  fff26b7b78c796451258e0b4f0ce4acc81581776# Parent  d4ca429eecd435994f9eb7be7b48d57c1c9301a3
Слияние

diff -r fff26b7b78c7 -r 851697c5c2f2 mm7_2.cpp
diff -r fff26b7b78c7 -r 851697c5c2f2 mm7_6.cpp