# HG changeset patch
# User Ritor1
# Date 1364095176 -21600
# Node ID da80bd2922dfded0dfc121d2b71ac7726cc3e860
# Parent  a821bbace19431ff683d1147690805c06958279f# Parent  c47efaf23642569f0974ac8c6228b35fa5018067
Слияние

diff -r c47efaf23642 -r da80bd2922df MM7.h
diff -r c47efaf23642 -r da80bd2922df UIHouses.cpp
diff -r c47efaf23642 -r da80bd2922df mm7_2.cpp
diff -r c47efaf23642 -r da80bd2922df mm7_4.cpp
diff -r c47efaf23642 -r da80bd2922df mm7_data.cpp