# HG changeset patch
# User Ritor1
# Date 1352862871 -21600
# Node ID 2546de5c70dd883dbdc4eeab70a423fec7fca542
# Parent  6c67511e2f7171f8a64bd42cded0f45567868170# Parent  a2715ce5cf172f41e18f7db1e2c3e5e9e0edcb0d
Слияние

diff -r a2715ce5cf17 -r 2546de5c70dd LOD.cpp
diff -r a2715ce5cf17 -r 2546de5c70dd mm7_3.cpp